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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-07-13 16:38:56 +08:00
parent e592ee1e86
commit 3e2b8d0cb7
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/EndProductServiceImpl.java
View File

@@ -210,6 +210,9 @@ public class EndProductServiceImpl implements EndProductService {
offlinejo.put("create_id", userDto.getId()); offlinejo.put("create_id", userDto.getId());
offlinejo.put("create_name", userDto.getNickName()); offlinejo.put("create_name", userDto.getNickName());
offlinejo.put("create_time", DateUtil.now()); offlinejo.put("create_time", DateUtil.now());
offlinejo.put("workorder_id", (String) jsonObject.get("workorder_id"));
offlinejo.put("workordercard_id", (String) jsonObject.get("workordercard_id"));
offlinejo.put("worktaskno_id", (String) jsonObject.get("worktask_id"));
WQLObject.getWQLObject("PDM_BI_ProcedureOfflineBucketRecord").insert(offlinejo); WQLObject.getWQLObject("PDM_BI_ProcedureOfflineBucketRecord").insert(offlinejo);
} else { } else {
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = new HashMap<>();
@@ -224,6 +227,9 @@ public class EndProductServiceImpl implements EndProductService {
map.put("create_id", userDto.getId()+""); map.put("create_id", userDto.getId()+"");
map.put("create_name", userDto.getNickName()); map.put("create_name", userDto.getNickName());
map.put("create_time", DateUtil.now()); map.put("create_time", DateUtil.now());
map.put("workorder_id", (String) jsonObject.get("workorder_id"));
map.put("workordercard_id", (String) jsonObject.get("workordercard_id"));
map.put("worktaskno_id", (String) jsonObject.get("worktask_id"));
WQLObject.getWQLObject("PDM_BI_ProcedureOfflineBucketRecord").update(map, "bucketunique = '" + bucketunique + "'"); WQLObject.getWQLObject("PDM_BI_ProcedureOfflineBucketRecord").update(map, "bucketunique = '" + bucketunique + "'");
} }

7
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java
View File

@@ -141,6 +141,7 @@ public class PdaBucketServiceImpl implements PdaBucketService {
result_qty = BigDecimal.valueOf(mst.getDoubleValue("storage_qty")); result_qty = BigDecimal.valueOf(mst.getDoubleValue("storage_qty"));
String bucketunique = mst.getString("bucketunique"); String bucketunique = mst.getString("bucketunique");
String is_active = mst.getString("is_active");
String material_id = mst.getString("material_id"); String material_id = mst.getString("material_id");
MaterialbaseDto materDto = materialbaseService.findById(Long.parseLong(material_id)); MaterialbaseDto materDto = materialbaseService.findById(Long.parseLong(material_id));
String input_optid = mst.getString("accountId"); String input_optid = mst.getString("accountId");
@@ -165,7 +166,7 @@ public class PdaBucketServiceImpl implements PdaBucketService {
bucketJo.put("ivt_level", "01"); bucketJo.put("ivt_level", "01");
bucketJo.put("quality_scode", "02"); bucketJo.put("quality_scode", "02");
bucketJo.put("storage_qty", mst.getString("storage_qty")); bucketJo.put("storage_qty", mst.getString("storage_qty"));
bucketJo.put("is_active", "0"); bucketJo.put("is_active", is_active);
bucketJo.put("bag_qty", dtl.size()); bucketJo.put("bag_qty", dtl.size());
bucketJo.put("record_order", "1"); bucketJo.put("record_order", "1");
bucketJo.put("status", "01"); bucketJo.put("status", "01");
@@ -187,7 +188,7 @@ public class PdaBucketServiceImpl implements PdaBucketService {
bucketJo.put("ivt_level", "01"); bucketJo.put("ivt_level", "01");
bucketJo.put("quality_scode", "02"); bucketJo.put("quality_scode", "02");
bucketJo.put("storage_qty", mst.getString("storage_qty")); bucketJo.put("storage_qty", mst.getString("storage_qty"));
bucketJo.put("is_active", "0"); bucketJo.put("is_active", is_active);
bucketJo.put("bag_qty", dtl.size()); bucketJo.put("bag_qty", dtl.size());
bucketJo.put("record_order", "1"); bucketJo.put("record_order", "1");
bucketJo.put("status", "01"); bucketJo.put("status", "01");
@@ -231,7 +232,7 @@ public class PdaBucketServiceImpl implements PdaBucketService {
changeObj.put("material_id", material_id); changeObj.put("material_id", material_id);
changeObj.put("pcsn", pcsn); changeObj.put("pcsn", pcsn);
changeObj.put("ivt_level", "01"); changeObj.put("ivt_level", "01");
changeObj.put("is_active", "0"); changeObj.put("is_active", is_active);
changeObj.put("quality_scode", "02"); changeObj.put("quality_scode", "02");
String change_type_scode = ""; String change_type_scode = "";
if (change_qty.doubleValue() < 0) { if (change_qty.doubleValue() < 0) {