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

补回丢失代码

main
userName 2025-02-17 17:20:23 +08:00
parent 594459468e
commit 709b9cf354
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7085,9 +7085,14 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
SimpleDateFormat hms = new SimpleDateFormat("HH:mm:ss");
Location lc=commonDao.load(Location.class, t.getSrcLoc().getId());
WarehouseArea zone=commonDao.load(WarehouseArea.class, lc.getZone().getId());
String lot=ik.getLotInfo().getPropC1() == null ? "" : ik.getLotInfo().getPropC1();//批号
if(item.getIsBOM()) {
if(ik.getLotInfo().getPropD2()!=null) {
lot=lot+ymd1.format(ik.getLotInfo().getPropD2());//有效期
}
}
String content=contentJson(pt.getCode(), t.getBillCode(), item.getName(), item.getCode(), slocCode,
Double.valueOf(quantity), item.getUnit(), ik.getLotInfo().getPropC1()==null?"":ik.getLotInfo().getPropC1(),wName,
Double.valueOf(quantity), item.getUnit(), lot,wName,
barcode,emergent,remark,ymd1.format(pt.getOrderDate()),ptd.getStrBill12(),t.getStrBill1(),
ymd1.format(t.getOperateTime()==null? new Date():t.getOperateTime()),
ik.getLotInfo().getPropC2()==null?"":ik.getLotInfo().getPropC2(),ptd.getLocType(),

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

@ -7217,7 +7217,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
WarehouseArea zone = this.load(WarehouseArea.class, srcLoc.getZone().getId());
Worker w = null;
if(t.getWorker4()!=null) {
w = this.load(Worker.class, t.getWorker4().getId());
w = this.load(Worker.class, t.getWorker4().getId());
}
PrintEquipment printEquipment = commonDao.load(PrintEquipment.class, pId);
SimpleDateFormat ymd = new SimpleDateFormat("yyyyMMdd");
@ -7255,11 +7255,15 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
}
}
SimpleDateFormat hms = new SimpleDateFormat("HH:mm:ss");
String lot=ik.getLotInfo().getPropC1() == null ? "" : ik.getLotInfo().getPropC1();//批号
if(item.getIsBOM()) {
if(ik.getLotInfo().getPropD2()!=null) {
lot=lot+ymd1.format(ik.getLotInfo().getPropD2());//有效期
}
}
String content = contentJson(pt.getCode(), t.getBillCode(), item.getName(), item.getCode(),
srcLoc.getCode(), t.getMovedQuantityMU(), item.getUnit(),
ik.getLotInfo().getPropC1() == null ? "" : ik.getLotInfo().getPropC1(),
w == null ? "" : w.getName(), barcode,emergent,remark,
lot,w == null ? "" : w.getName(), barcode,emergent,remark,
ymd1.format(pt.getOrderDate()),ptd.getStrBill12(),t.getStrBill1(),ymd1.format(t.getOperateTime()),
ik.getLotInfo().getPropC2()==null?"":ik.getLotInfo().getPropC2(),ptd.getLocType(),
ptd.getStrBill13()==null?"":ptd.getStrBill13(),t.getDstLP()!=null?t.getDstLP().getLP():"",

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

@ -180,7 +180,7 @@
<column id="inventory.lock" title="盘点锁定" visible="true" horizonAlign="center" format="booleanFormat"/>
</columns>
<buttons>
<popup id="editInventoryStatus" title="冻结库存" enableType="single" invisible="false" containId="true" pageId="editInventoryStatus">
<popup id="editInventoryStatus" title="冻结库存" enableType="multi" invisible="false" containId="true" pageId="editInventoryStatus">
<enableExpression><![CDATA[(${inventory.status}=='已入库'&&${inventory.queuedQuantity}<=0)]]></enableExpression>
</popup>
<!-- <commit id="frozenInv" title="冻结库存" -->

10
src/webapp/WEB-INF/classes/config/origen/shipping/maintainBillPage.xml
View File

@ -106,8 +106,13 @@
<date id="endDate3" title="至"
row="9" col="2" readOnly="false" required="false" reserve="false"
forceOverride="false" inVisible="false" showTime="false"
manualEditable="true" defaultCurrentDate="false" />
<checkbox id="ordersAll" title="ordersAll" row="10" col="1" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
manualEditable="true" defaultCurrentDate="false" />
<list id="billType.name" title="单据类型" row="10" col="1" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="BillType">
<hql><![CDATA[ SELECT
billType.id,
billType.name From BillType billType]]></hql>
</list>
<checkbox id="ordersAll" title="ordersAll" row="11" col="1" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
</inputUIs>
</search>
@ -188,6 +193,7 @@
/~inventory.SOI: AND task.billCode LIKE {inventory.SOI}~/
/~task.strBill4: AND task.strBill4 LIKE {task.strBill4}~/
/~propC2: AND itemKey.lotInfo.propC2 like {propC2} ~/)
/~billType.name: AND billType.id = {billType.name}~/
/~szone.id: AND szone.id = {szone.id}~/
order by task.pickTicketDetail.pickTicket.orderDate,task.id desc
]]></datasource>