Youchain
/
ZhongWei_Old2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 拣货标签补打，记录打印次数。 

2. 不良品库存分配库存，新增单独分配界面。

3. PDA和工作站新增一包一个显示是否，并可以调整该信息。
main
userName 2025-02-28 02:13:16 +08:00
parent 8c964a1529
commit 7e61e7676d
18 changed files with 154 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/dev/swms/server/model/shipping/PrintTask.java
View File

@ -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;
}

2
src/main/java/com/dev/swms/server/model/shipping/printTask.hbm.xml
View File

@ -21,6 +21,6 @@
<property name="printTime" column="printTime" type="timestamp" />
<property name="printName" column="printName" type="string" length="50" />
<property name="printTitle" column="printTitle" type="string" length="50" />
<property name="printType" column="printType" type="string" length="50" />
</class>
</hibernate-mapping>

4
src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceRespManager.java
View File

@ -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<PickTicket> 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<Personnel> 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);

3
src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultQueryAppManager.java
View File

@ -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);
// }

5
src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java
View File

@ -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<Task> 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

5
src/main/java/com/dev/swms/server/service/shipping/PickTicketManager.java
View File

@ -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<Long> ids,Long id);
//打印标签
@Transactional
void updatePrintTask(List<Long> ids,Long pId,int nuber);
void updatePrintTask(List<Long> ids,Long pId,int nuber,String print);
//记录标签补打次数
@Transactional
void reprintPrintTask(String barCode,Long pId,int nuber,Long workerId);

53
src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java
View File

@ -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<Long> ids, Long pId, int nuber) {
public void updatePrintTask(List<Long> 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<Long> 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<OperationHis> 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<OperationHis> 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 {

2
src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocManager.java
View File

@ -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 ";

4
src/test/yao/2024.sql
View File

@ -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;

5
src/webapp/WEB-INF/classes/config/origen/base/editPrintTaskPage.xml
View File

@ -17,7 +17,7 @@
where 1=1
]]></hql>
</list>
<text id="ddd" title="是否补打" row="3" col="1" readOnly="false" defaultValue="0" />
</inputUIs>
<buttons>
<commit id="pick" title="0013D4FC457C1190272672531"
@ -26,10 +26,11 @@
<mapping id="parentIds" className="list" />
<mapping id="print" className="long" />
<mapping id="aaa" className="int" />
<mapping id="ddd" className="string" />
</mappings>
<actions>
<action managerName="pickTicketManager" methodName="updatePrintTask"
parameter="parentIds,print,aaa" />
parameter="parentIds,print,aaa,ddd" />
</actions>
<forwards>
<forward name="refreshParent" newEnabled="true"

3
src/webapp/WEB-INF/classes/config/origen/base/maintainItemPage.xml
View File

@ -66,6 +66,7 @@
item.alertLeadingDays,
item.singleItem,
item.brand,
item.beUnpacking,
item.beMarkWeight,
item.isBOM,
item.beWeight,
@ -135,6 +136,8 @@
horizonAlign="center" format="booleanFormat"/>
<column id="item.brand" title="批次规则" visible="true"
horizonAlign="center" />
<column id="item.beUnpacking" title="是否一包一个" visible="true"
horizonAlign="center" format="booleanFormat"/>
<column id="item.beMarkWeight" title="是否序列号" visible="true"
horizonAlign="center" format="booleanFormat"/>
<column id="item.isBOM" title="是否有效期管理" visible="true"

4
src/webapp/WEB-INF/classes/config/origen/count/maintainCountPlanPage.xml
View File

@ -56,10 +56,10 @@
/~endDate: or (CONVERT(varchar(100), countPlan.planDate, 23)>= {beginDate} and CONVERT(varchar(100), countPlan.planDate, 23)<= {endDate}) ~/
)
/~countPlan.status: AND countPlan.status = {countPlan.status}~/
order by countPlan.countDate desc ]]></datasource>
order by countPlan.id desc ]]></datasource>
<columns>
<column id="countPlan.id" title="ID" visible="true" width="60" horizonAlign="center" verticalAlign="middle" />
<column id="countPlan.code" title="countPlan.code" visible="true" horizonAlign="left" verticalAlign="middle" sortIndex="1" sortType="DESC" />
<column id="countPlan.code" title="countPlan.code" visible="true" horizonAlign="left" verticalAlign="middle" />
<column id="countPlan.planDate" title="创建日期"
visible="true" horizonAlign="left" verticalAlign="middle" sortIndex="1" sortType="DESC" />
<column id="countPlan.countMethod" title="countPlan.countMethod"

2
src/webapp/WEB-INF/classes/config/origen/inventory/maintainPrintTaskPage.xml
View File

@ -3,7 +3,7 @@
<pages>
<maintainPage id="maintainPrintTaskPage" title="打印机任务管理"
autoQuery="false">
<search>
<search>maintainPrintTaskUsesPage
<inputUIs>
<text id="pt.printTitle" title="标签" row="0" col="1" span="1"
readOnly="false" required="false" reserve="false" forceOverride="false"

81
src/webapp/WEB-INF/classes/config/origen/inventory/maintainPrintTaskUsesPage.xml 100644
View File

@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<pages>
<maintainPage id="maintainPrintTaskUsesPage" title="打印机补打任务"
autoQuery="false">
<search>
<inputUIs>
<text id="pt.printTitle" title="标签" row="0" col="1" span="1"
readOnly="false" required="false" reserve="false" forceOverride="false"
inVisible="false" trimSpace="false" />
<text id="pt.status" title="状态" row="1" col="1" span="1"
readOnly="false" required="false" reserve="false" forceOverride="false"
inVisible="false" trimSpace="false" />
<date id="beginDate" title="日期" row="2" col="1"
readOnly="false" required="false" reserve="false" forceOverride="false"
inVisible="false" showTime="false" manualEditable="true"
defaultCurrentDate="false" />
<date id="endDate" title="至" row="2" col="2"
readOnly="false" required="false" reserve="false" forceOverride="false"
inVisible="false" showTime="false" manualEditable="true"
defaultCurrentDate="false" />
</inputUIs>
</search>
<datasource type="hql"><![CDATA[SELECT
pt.id,
pt.printName,
pt.printTitle,
pt.mac,
pt.createName,
pt.createDate,
pt.createDate,
pt.content,
pt.quantity,
case pt.status when '1' then '完成' else '未完成' end,
case when pt.type='0' then '拣货标签'
when pt.type='1' then '收货整理标签'
when pt.type='2' then '有效期标签'
when pt.type='3' then '补打标签'
when pt.type='15' then '容器标签' else pt.type end
FROM PrintTask pt
where 1=1 and pt.printType='1'
/~pt.printTitle: AND pt.printTitle LIKE {pt.printTitle}~/
/~pt.status: AND pt.status LIKE {pt.status}~/
/~beginDate: AND CONVERT(varchar(100), pt.createDate, 23) >= {beginDate} ~/
/~endDate: AND CONVERT(varchar(100), pt.createDate, 23)<= {endDate} ~/
order by pt.id desc
]]></datasource>
<columns>
<column id="pt.id" title="序号" visible="false"
horizonAlign="center" verticalAlign="middle" />
<column id="pt.printName" title="打印人" visible="true"
horizonAlign="center" />
<column id="pt.printTitle" title="标签" visible="true"
horizonAlign="center" />
<column id="pt.mac" title="打印机电脑mac地址" visible="true" width="100"
horizonAlign="center" />
<column id="pt.createName" title="发起人" visible="true" width="80"
horizonAlign="center" />
<column id="pt.createDate1" title="发起日期" visible="true" width="100"
horizonAlign="center" format="dateFormatter"/>
<column id="pt.createDate2" title="发起时间" visible="true" width="100"
horizonAlign="center" format="dateTiemFormatter"/>
<column id="pt.content" title="打印JSON内容"
visible="true" horizonAlign="center" verticalAlign="middle" />
<column id="pt.quantity" title="张数"
visible="true" horizonAlign="center" verticalAlign="middle" />
<column id="pt.status" title="状态"
visible="true" horizonAlign="center" verticalAlign="middle" />
<column id="pt.type" title="类型"
visible="true" horizonAlign="center" verticalAlign="middle" />
</columns>
<buttons>
<!-- <popup id="edit" title="调整打印任务" enableType="single" invisible="false" -->
<!-- containId="true" pageId="editPrintTaskStatusPage" /> -->
</buttons>
</maintainPage>
</pages>

2
src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
View File

@ -25,6 +25,8 @@
<menuItem title="打印机管理" dir="receiving11">
<menuItem title="打印机设备管理" pageId="maintainPrintEquipmentPage"/>
<menuItem title="打印机任务管理" pageId="maintainPrintTaskPage"/>
<menuItem title="打印机补打任务" pageId="maintainPrintTaskUsesPage"/>
</menuItem>
<menuItem title="maintainBillTypePage" pageId="maintainBillTypePage"/>
<menuItem title="maintainPlantInfoTypePage" pageId="maintainPlantInfoTypePage"/>

2
src/webapp/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml
View File

@ -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 @@
<column id="pickTicketDetail.strBill2" title="状态" visible="true" horizonAlign="center" />
<column id="pickTicketDetail.strBill1" title="SAP单号" visible="true" horizonAlign="center" />
<column id="pickTicketDetail.SOI" title="加急标记" visible="true" horizonAlign="center" />
<column id="pickTicketDetail.strBill15" title="序列号标记" visible="true" horizonAlign="center" />
<column id="pickTicketDetail.description" title="备注" visible="true" horizonAlign="center" />
</columns>
<buttons>

2
src/webapp/WEB-INF/classes/config/origen/shipping/maintainReceivingInventoryManualPage.xml
View File

@ -2,7 +2,7 @@
<pages>
<maintainPage id="maintainReceivingInventoryManualPage"
title="maintainReceivingInventoryManualPage" width="950" height="550"
title="不良品库存" width="950" height="550"
autoQuery="true">
<search>
<inputUIs>

12
src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml
View File

@ -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 @@
<column id="item.name" title="物料描述" visible="true" horizonAlign="center" />
<column id="item.unit" title="单位" visible="true" horizonAlign="center" />
<column id="item.shipRules" title="价值等级" visible="true" horizonAlign="center" />
<!-- <column id="warehouseArea.name" title="拣货库区" visible="false" horizonAlign="center" /> -->
<column id="srcLoc.code" title="拣货库位" visible="true" horizonAlign="center" />
<column id="dstLP.remark" title="容器码" visible="true" horizonAlign="center" />
<column id="dLzone.name" title="所在库区" visible="true" horizonAlign="center" />
@ -319,6 +319,8 @@
<column id="t.barCode" title="序列号" visible="true" horizonAlign="center" />
<column id="t.inventoryStatus" title="库存状态" visible="true" horizonAlign="center" />
<column id="pickTicketDetail.lineNumber" title="项号" visible="true" horizonAlign="center" />
<column id="t.beUnpacking" title="是否一包一个" visible="true"
horizonAlign="center" format="booleanFormat"/>
<column id="pickTicket.updateTime1" title="创建日期" visible="true"
horizonAlign="center" format="dateFormatter" />
<column id="pickTicket.updateTime2" title="创建时间" visible="true"
@ -333,8 +335,6 @@
<column id="t.createTime11" title="拣货日期" visible="true" horizonAlign="center" format="dateFormatter" />
<column id="t.createTime12" title="拣货时间" visible="true" horizonAlign="center" format="dateTiemFormatter" />
<column id="t.operator" title="当前操作人" visible="true" horizonAlign="center" />
<!-- <column id="t.dateline1" title="操作日期" visible="true" horizonAlign="center" format="dateFormatter" /> -->
<!-- <column id="t.dateline2" title="操作时间" visible="true" horizonAlign="center" format="dateTiemFormatter" /> -->
<column id="waveDoc.code" title="波次号" visible="true" horizonAlign="center" />
<column id="t.createTime1" title="分配日期" visible="true" horizonAlign="center" format="dateFormatter" />
<column id="t.createTime2" title="分配时间" visible="true" horizonAlign="center" format="dateTiemFormatter" />