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

no message

main
暴炳林 2025-01-02 11:14:29 +08:00
parent 024366cd21
commit 3664d4bc78
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java
View File

@ -3750,7 +3750,7 @@ public class DefaultInventoryManager extends DefaultBaseManager implements Inven
+" left join LOCATION loc on inv.LOCATION_ID=loc.ID " +" left join LOCATION loc on inv.LOCATION_ID=loc.ID "
+" left join STOCK sto on loc.stock=sto.ID " +" left join STOCK sto on loc.stock=sto.ID "
+" right join (select containerCode from agvtask " +" right join (select containerCode from agvtask "
+" where status='ATWORK') agv on agv.containerCode=sto.REMARK "; +" where status='ATWORK') agv on agv.containerCode=sto.REMARK and inv.id is not null";
List<Long> ids= jdbcManager.getListLong(sql); List<Long> ids= jdbcManager.getListLong(sql);
return ids; return ids;
} }

16
src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java
View File

@ -227,17 +227,19 @@ public class DefaultNewAutoAllocator extends DefaultBaseManager implements NewAu
if (invIds.size()>0) { if (invIds.size()>0) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (int k = 0; k < invIds.size(); k++) { for (int k = 0; k < invIds.size(); k++) {
sb.append(invIds.get(k)); sb.append(invIds.get(k));
if (k < invIds.size() - 1) { if (k < invIds.size() - 1) {
sb.append(","); sb.append(",");
} }
} }
sqlBuffer.append(" CASE " if (sb.length()>0) {
+" WHEN i.id IN (" sqlBuffer.append(" CASE "
+ sb.toString() +" WHEN i.id IN ("
+") THEN 1 " + sb.toString()
+" ELSE 0 " +") THEN 1 "
+" END, "); +" ELSE 0 "
+" END, ");
}
} }
sqlBuffer.append(" i.itemKey.lotInfo.propD2,i.itemKey.lotInfo.propC3,i.itemKey.lotInfo.propC1,i.statuss desc,i.storageDate,i.quantity,i.id"); sqlBuffer.append(" i.itemKey.lotInfo.propD2,i.itemKey.lotInfo.propC3,i.itemKey.lotInfo.propC1,i.statuss desc,i.storageDate,i.quantity,i.id");
String hql2=sqlBuffer.toString(); String hql2=sqlBuffer.toString();