diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java index 23aec10e..4e6e2bca 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java @@ -416,7 +416,6 @@ public class DailyplanServiceImpl implements DailyplanService { new_jo.put("qty_unit_id",jo.getString("weight_unit_id")); new_jo.put("qty_unit_name",jo.getString("weight_unit_name")); - new_jo.put("workorder_qty",jo.getString("standard_weight")); new_jo.put("planstart_time",jo.getString("planstart_date").substring(0,10)+" 08:00:00"); new_jo.put("planend_time",jo.getString("planend_date").substring(0,10)+" 23:59:59"); new_jo.put("remark",jsonMst.getString("remark")); @@ -428,6 +427,7 @@ public class DailyplanServiceImpl implements DailyplanService { new_jo.put("org_id",jo.getString("org_id")); new_jo.put("is_experiment","0"); + new_jo.put("send_date",jsonMst.get("send_date")); new_jo.put("is_out",ObjectUtil.isNotEmpty(new_jo.get("send_date"))?"1":"0"); workOrdereService.create(new_jo); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java index de69600e..86d9742a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java @@ -158,6 +158,18 @@ public class IvtQueryServiceImpl implements IvtQueryService { List> list = new ArrayList<>(); for (int i = 0; i < rows.size(); i++) { JSONObject jo = rows.getJSONObject(i); + JSONObject jo2 = WQL.getWO("Qivt_query_02").addParam("flag","1") + .addParam("storagevehicle_code",jo.getString("storagevehicle_code")) + .addParam("is_active",jo.getString("is_active")) + .addParam("ivt_level",jo.getString("ivt_level")) + .addParam("quality_scode",jo.getString("quality_scode")) + .addParam("pcsn",jo.getString("pcsn")) + .addParam("material_id",jo.getString("material_id")).process().uniqueResult(0); + if(jo2!=null){ + jo.put("bucket_num",jo2.getDouble("bucket_num")); + }else{ + jo.put("bucket_num","0"); + } Map dtl_map = new LinkedHashMap<>(); dtl_map.put("仓库", jo.getString("stor_name")); dtl_map.put("库区", jo.getString("sect_name")); diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue b/mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue index 5e73ddee..89c8e00d 100644 --- a/mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue +++ b/mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue @@ -70,11 +70,11 @@ - - - - - + + + + +-