diff --git a/src/main/java/com/dev/swms/server/model/shipping/PrintTask.java b/src/main/java/com/dev/swms/server/model/shipping/PrintTask.java
index 6851250..d2dc6f0 100644
--- a/src/main/java/com/dev/swms/server/model/shipping/PrintTask.java
+++ b/src/main/java/com/dev/swms/server/model/shipping/PrintTask.java
@@ -40,8 +40,16 @@ public class PrintTask extends Entity{
/*标题*/
private String printTitle;
+ /*补打标记*/
+ private String printType="0";
+ public String getPrintType() {
+ return printType;
+ }
+ public void setPrintType(String printType) {
+ this.printType = printType;
+ }
public String getPrintTitle() {
return printTitle;
}
diff --git a/src/main/java/com/dev/swms/server/model/shipping/printTask.hbm.xml b/src/main/java/com/dev/swms/server/model/shipping/printTask.hbm.xml
index aba918b..92f109f 100644
--- a/src/main/java/com/dev/swms/server/model/shipping/printTask.hbm.xml
+++ b/src/main/java/com/dev/swms/server/model/shipping/printTask.hbm.xml
@@ -21,6 +21,6 @@
-
+
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceRespManager.java b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceRespManager.java
index a9abad2..78008d3 100644
--- a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceRespManager.java
+++ b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceRespManager.java
@@ -1540,6 +1540,8 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
String itemCode=JSONobj.has("itemCode")? JSONobj.getString("itemCode"):"";//货品(物料料号)(物料描述)
String orderNumber=JSONobj.has("orderNumber") ? JSONobj.getString("orderNumber") : "";//单号
String applicant=JSONobj.has("applicant") ? JSONobj.getString("applicant") : "";//申请人
+ String handoverLocation=JSONobj.has("handoverLocation") ? JSONobj.getString("handoverLocation") : "";//交单位置
+
List pickt=commonDao.findByQuery(" from PickTicket pt where pt.code='"+orderNumber+"'");
log.setFunction(orderNumber);
if(pickt.size()>0) {
@@ -1559,6 +1561,7 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
pickTicket.setUpdateTime(new Date());
pickTicket.setWorkerName4(applicant);
pickTicket.setWorkerName1(applicant);
+ pickTicket.setShipmentMethod(handoverLocation);
List ps=commonDao.findByQuery(" from Personnel p where p.number='"+applicant+"'");
if(ps.size()>0) {
Personnel ps1=ps.get(0);
@@ -1598,6 +1601,7 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
pickTicketDetail.setLineNumber(i+1+"");
pickTicketDetail.setLongExtend1(inv.getId());
pickTicket.setWorkerName1(ik.getLotInfo().getPropC9());
+ pickTicketDetail.setStrBill16(handoverLocation);
commonDao.store(pickTicket);
commonDao.store(pickTicketDetail);
pickTicketManager.refreshOrderQuantity(pickTicket);
diff --git a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultQueryAppManager.java b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultQueryAppManager.java
index 41653ae..a47c549 100644
--- a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultQueryAppManager.java
+++ b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultQueryAppManager.java
@@ -7112,7 +7112,7 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
hms.format(t.getOperateTime()==null? new Date():t.getOperateTime()),
zone.isBeBill()?"需要合单":"");
//打印拣货标签
- pickTicketManager.createPrintTask(number, content, userId, macs,printName,t.getBillCode()+"/"+item.getCode());
+ pickTicketManager.createPrintTask(number, content, userId, macs,printName,t.getBillCode()+"/"+item.getCode(),"0");
//打印容器码
if(zone.getId()==1765&&item.getGoodType().equals("大件")) {
@@ -9143,7 +9143,6 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
}
}
-
// if(t.getPlanQuantity()==0){
// commonDao.delete(t);
// }
diff --git a/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java
index bcfd2fd..ea8b7bb 100644
--- a/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java
+++ b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java
@@ -1893,7 +1893,7 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo
map.put("waveDoc.id", id);
getQuantityMap(map);
System.out.printf("取消分配执行时长："+(etime - stime)+"\n");
- jdbcManager.saveExceptionLog(UserHolder.getUser().getName()+"取消分配!");
+ jdbcManager.saveExceptionLog(UserHolder.getUser().getName()+"取消分配!"+wd.getCode());
}
}
@@ -1922,6 +1922,9 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo
for(Long id:pickIds){
long stime = System.currentTimeMillis();
PickTicket pt =this.load(PickTicket.class, id);//出库单
+ if(pt.getPickedQuantity()>0) {
+ throw new BusinessException("已经拣货不能取消分配");
+ }
List pds = commonDao.findByQuery(" from Task t where t.pickTicketDetail.pickTicket.id=:id and t.pickTicketDetail.pickedQuantity=0 ",
new String[] { "id"},new Object[] {pt.getId()});
if(pt != null&&pt.getCode().indexOf("CP")==-1
diff --git a/src/main/java/com/dev/swms/server/service/shipping/PickTicketManager.java b/src/main/java/com/dev/swms/server/service/shipping/PickTicketManager.java
index ea1b403..2acb35a 100644
--- a/src/main/java/com/dev/swms/server/service/shipping/PickTicketManager.java
+++ b/src/main/java/com/dev/swms/server/service/shipping/PickTicketManager.java
@@ -690,7 +690,8 @@ public interface PickTicketManager extends BaseManager {
void cancelPickticketDetailAndTask(Long taskId);
@Transactional
- void createPrintTask(long number, String content, long userId,String mac,String printName,String printTitle);
+ void createPrintTask(long number, String content, long userId,String mac,
+ String printName,String printTitle,String typePrint);
//根据到站料箱生成输送线任务
@Transactional
void createLineTask(String locCode);
@@ -709,7 +710,7 @@ public interface PickTicketManager extends BaseManager {
void createAGVtask(List ids,Long id);
//打印标签
@Transactional
- void updatePrintTask(List ids,Long pId,int nuber);
+ void updatePrintTask(List ids,Long pId,int nuber,String print);
//记录标签补打次数
@Transactional
void reprintPrintTask(String barCode,Long pId,int nuber,Long workerId);
diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java
index b84fdbb..356b429 100644
--- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java
+++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java
@@ -7045,7 +7045,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
}
@Override
public void createPrintTask(long number, String content, long userId, String mac, String printName,
- String printTitle) {
+ String printTitle,String typePrint) {
PrintTask pt = EntityFactory.getEntity(PrintTask.class);
pt.setType("0");// 拣货标签
pt.setStatus("0");// 默认未打印
@@ -7055,7 +7055,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
Worker w = this.load(Worker.class, userId);
pt.setCreateName(w.getName());
}
-
+ pt.setPrintType(typePrint);
pt.setCreateDate(new Date());
pt.setMac(mac);
pt.setPrintName(printName);
@@ -7206,7 +7206,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
}
}
- public void updatePrintTask(List ids, Long pId, int nuber) {
+ public void updatePrintTask(List ids, Long pId, int nuber,String print) {
for(Long taskId:ids) {
Task t = commonDao.load(Task.class, taskId);
if (t != null) {
@@ -7275,7 +7275,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
// 打印拣货标签
createPrintTask(nuber, content, t.getWorker4().getId(), macs, printName,
- t.getBillCode() + "/" + item.getCode());
+ t.getBillCode() + "/" + item.getCode(),"0");
}
}
@@ -10087,33 +10087,34 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
if(nuber<=0) {
throw new BusinessException("打印张数必须大于0");
}
+
String sql ="select t.id from Task t where t.movedQuantityMU>0 and "
+ " t.billCode='"+billCode+"' and t.itemKey.item.code='"+itemcode+"'"
+ " and t.pickTicketDetail.lineNumber='"+itemNuber+"'";
List list=commonDao.findByQuery(sql);
if(list.size()>0) {
- updatePrintTask(list, pId, nuber);
- OperationHis his =null;
- String hql=" from OperationHis o where o.sourceType='补打标签' and actionName='补打标签' ";
- List ohs=commonDao.findByQuery(hql);
- if(ohs.size()>0) {
- his=ohs.get(0);
- }
- if(his==null) {
- his= (OperationHis) EntityFactory.getEntity(OperationHis.class);
- his.setSourceId(pId);
- his.setSourceNo(barCode);
- his.setSourceType("补打标签");
- his.setActionName("补打标签");
- his.setQuantity(his.getQuantity()+1);
-
- his.setRemark("补打标签");
- his.setWarehouseId(1L);
- his.setExtendStr1("WMS");
- his.setUserId(workerId);
- his.setUpdateTime(new Date());
- this.commonDao.store(his);
- }
+ updatePrintTask(list, pId, nuber,"1");
+// OperationHis his =null;
+// String hql=" from OperationHis o where o.sourceType='补打标签' and actionName='补打标签' ";
+// List ohs=commonDao.findByQuery(hql);
+// if(ohs.size()>0) {
+// his=ohs.get(0);
+// }
+// if(his==null) {
+// his= (OperationHis) EntityFactory.getEntity(OperationHis.class);
+// his.setSourceId(pId);
+// his.setSourceNo(barCode);
+// his.setSourceType("补打标签");
+// his.setActionName("补打标签");
+// his.setQuantity(his.getQuantity()+1);
+//
+// his.setRemark("补打标签");
+// his.setWarehouseId(1L);
+// his.setExtendStr1("WMS");
+// his.setUserId(workerId);
+// his.setUpdateTime(new Date());
+// this.commonDao.store(his);
+// }
// wmsOperationHisManager.storeOperationHis(pId, barCode, null, "", "补打标签", "补打标签", null, null, 0,
// nuber, 0, 0, "", "WMS");
}else {
diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocManager.java
index c2fd41b..9aa22ed 100644
--- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocManager.java
+++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocManager.java
@@ -2752,7 +2752,7 @@ public class DefaultWaveDocManager extends DefaultBaseManager implements
+ " and ptd.pickTicket.billType.name='工单出库' "
+ " and ptd.pickedQuantity=0 and ptd.shippedQuantity=0 "
+ " and (ptd.strBill6 is null or ptd.strBill6='' ) "
- + " and ptd.newLotInfo.propC2 not in('SL55') "
+ + " and ptd.newLotInfo.propC2 not in("+noLoc+") "
+ " and (ptd.waveDoc.id is null ) "
+ " and ptd.pickTicket.status ='OPEN' "
+ " order by ptd.SOI desc,ptd.pickTicket.orderDate, ptd.pickTicket.code,ptd.item.code ";
diff --git a/src/test/yao/2024.sql b/src/test/yao/2024.sql
index f788b5a..a90e2a3 100644
--- a/src/test/yao/2024.sql
+++ b/src/test/yao/2024.sql
@@ -470,3 +470,7 @@ GO
ALTER TABLE task add NCR_CODE varchar(50) COLLATE Chinese_PRC_CI_AS NULL;
GO
+------------2025-02-27
+ALTER TABLE PrintTask add printType varchar(50) COLLATE Chinese_PRC_CI_AS NULL;
+GO
+update PrintTask set printType='0' where printType is null;
\ No newline at end of file
diff --git a/src/webapp/WEB-INF/classes/config/origen/base/editPrintTaskPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/editPrintTaskPage.xml
index 6bbda88..b692776 100644
--- a/src/webapp/WEB-INF/classes/config/origen/base/editPrintTaskPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/base/editPrintTaskPage.xml
@@ -17,7 +17,7 @@
where 1=1
]]>
-
+
+
+ parameter="parentIds,print,aaa,ddd" />
+
= {beginDate} and CONVERT(varchar(100), countPlan.planDate, 23)<= {endDate}) ~/
)
/~countPlan.status: AND countPlan.status = {countPlan.status}~/
- order by countPlan.countDate desc ]]>
+ order by countPlan.id desc ]]>
-
+
-
+ maintainPrintTaskUsesPage
+
+
+
+
+
+
+
+
+
+
+
+
+ = {beginDate} ~/
+ /~endDate: AND CONVERT(varchar(100), pt.createDate, 23)<= {endDate} ~/
+
+ order by pt.id desc
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
index 5aa2bf7..572308d 100644
--- a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
@@ -25,6 +25,8 @@
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml
index 5fba7e8..00e35bd 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml
@@ -87,6 +87,7 @@
pickTicketDetail.strBill2,
pickTicketDetail.strBill1,
pickTicketDetail.SOI,
+ pickTicketDetail.strBill15,
pickTicketDetail.description
FROM PickTicketDetail as pickTicketDetail
left join pickTicketDetail.item as item
@@ -128,6 +129,7 @@
+
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainReceivingInventoryManualPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainReceivingInventoryManualPage.xml
index b382fb6..e482de5 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainReceivingInventoryManualPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainReceivingInventoryManualPage.xml
@@ -2,7 +2,7 @@
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml
index 3ff2cd9..1a89b5b 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml
@@ -175,6 +175,7 @@
pickTicket.equatedQuantity,
t.barCode,
t.inventoryStatus,
+ t.beUnpacking,
pickTicketDetail.lineNumber,
pickTicket.updateTime,
pickTicket.updateTime,
@@ -199,9 +200,9 @@
t.strBill5,
t.dateBill3,
t.dateBill3,
- case when t.positionStatus=1 then t.operator when t.positionStatus=0 then '' end,
- case when t.positionStatus=1 then t.dateline when t.positionStatus=0 then '' end,
- case when t.positionStatus=1 then t.dateline when t.positionStatus=0 then '' end,
+ case when t.positionStatus='1' then t.operator when t.positionStatus='0' then '' end,
+ case when t.positionStatus='1' then t.dateline when t.positionStatus='0' then '' end,
+ case when t.positionStatus='1' then t.dateline when t.positionStatus='0' then '' end,
DATEDIFF(second, pickTicket.updateTime,t.dateBill1 )/60 ,
DATEDIFF(second, t.dateBill1,t.operateTime )/60 ,
DATEDIFF(second, t.operateTime,t.dateBill3)/60 ,
@@ -300,7 +301,6 @@
-
@@ -319,6 +319,8 @@
+
-
-