root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:分切计划推送优化、出库左出右出排序更改

Browse Source
This commit is contained in:
zhouz
2025-06-30 22:09:46 +08:00
parent 67d5dca6fd
commit f5a5c4b390
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
View File

@@ -529,7 +529,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
/** /**
* 分切包装段：分切计划（单表，包含母卷/改制子卷-包装箱号、空包装箱物料、纸筒/FRP管）MES下发智能物流 * 分切包装段：分切计划（单表，包含母卷/改制子卷-包装箱号、空包装箱物料、纸筒/FRP管）MES下发智能物流
* *
* @param param * @param ja
* @return * @return
*/ */
@Override @Override
@@ -539,7 +539,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
WQLObject tab = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan"); WQLObject tab = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan");
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
String now = DateUtil.now();
try { try {
for (int i = 0; i < ja.size(); i++) { for (int i = 0; i < ja.size(); i++) {
JSONObject param = ja.getJSONObject(i); JSONObject param = ja.getJSONObject(i);
@@ -716,7 +716,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
} }
json.put("sale_order_name", Attribute2); json.put("sale_order_name", Attribute2);
json.put("material_type", Attribute6); json.put("material_type", Attribute6);
json.put("start_time", DateUtil.now()); json.put("start_time", now);
json.put("status", "01"); json.put("status", "01");
json.put("qzz_generation", qzz_generation); json.put("qzz_generation", qzz_generation);
json.put("is_parent_ok", "0"); json.put("is_parent_ok", "0");

4
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -3276,6 +3276,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
for (int i = 0; i < structs.size(); i++) { for (int i = 0; i < structs.size(); i++) {
JSONObject item = structs.get(i); JSONObject item = structs.get(i);
item.put("task_group_id",taskGroup); item.put("task_group_id",taskGroup);
item.put("iostorinv_id",whereJson.getString("iostorinv_id"));
item.put("sort_seq",i); item.put("sort_seq",i);
item.put("point_code",point_code); item.put("point_code",point_code);
item.put("point_id",jsonPoint2.getString("point_id")); item.put("point_id",jsonPoint2.getString("point_id"));
@@ -3377,7 +3378,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
} }
} }
//option确认了左边出库还是右边出库03右边，02左边 //option确认了左边出库还是右边出库03右边，02左边
String orderBy = "order by out_order_seq "+(option.equals("02")?"asc":"desc"); String orderBy = "order by out_order_seq "+(option.equals("03")?"asc":"desc");
HashMap structParam = MapOf.of("flag", "53", "order_by",orderBy,"sect_id",left.getSect_id(),"block_num", left.getBlock_num(), "row_num", left.getRow_num()); HashMap structParam = MapOf.of("flag", "53", "order_by",orderBy,"sect_id",left.getSect_id(),"block_num", left.getBlock_num(), "row_num", left.getRow_num());
return WQL.getWO("ST_OUTIVT04").addParamMap(structParam).process().getResultJSONArray(0).toJavaList(JSONObject.class); return WQL.getWO("ST_OUTIVT04").addParamMap(structParam).process().getResultJSONArray(0).toJavaList(JSONObject.class);
} }
@@ -3467,6 +3468,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
public void createOut(JSONObject struct){ public void createOut(JSONObject struct){
List<StIvtIostorinvdis> list = iStIvtIostorinvdisService List<StIvtIostorinvdis> list = iStIvtIostorinvdisService
.list(new QueryWrapper<StIvtIostorinvdis>() .list(new QueryWrapper<StIvtIostorinvdis>()
.eq("iostorinv_id",struct.getString("iostorinv_id"))
.eq("box_no", struct.getString("storagevehicle_code"))); .eq("box_no", struct.getString("storagevehicle_code")));
StIvtIostorinvdis oneDis = list.get(0); StIvtIostorinvdis oneDis = list.get(0);
// 创建任务 // 创建任务