手持提交

wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/callMaterial/service/impl/CallMaterialServiceImpl.java

@@ -53,6 +53,7 @@ public class CallMaterialServiceImpl implements CallMaterialService {
     public Map<String, Object> bussConfirm(@RequestBody Map<String, String> param) {
         String is_full = param.get("is_full");
         String next_point_code = param.get("point_code");
+        String material_id = param.get("material_id");
         if (StrUtil.isEmpty(is_full)) {
             throw new PdaRequestException("是否满拖不能为空！");
         }
@@ -65,13 +66,7 @@ public class CallMaterialServiceImpl implements CallMaterialService {
         String point_type = pointObj.getString("point_type");
         //如果是压机上料位置则走转储的流程
         if (StrUtil.equals(point_type, "05")) {
-            //查询当前压机对应的排产单的物料信息是
+                       String startArea_type = AreaEnum.KLHJ.getCode();
-            JSONObject TaskObj = WQLObject.getWQLObject("PDM_MG_produceTask").query("device_id='" + pointObj.getString("device_id") + "' and producetask_status in ('02','03','04') and is_delete='0'").uniqueResult(0);
-            if (ObjectUtil.isEmpty(TaskObj)) {
-                throw new BadRequestException("未找到该点位设备的工单信息！");
-            }
-            String material_id = TaskObj.getString("material_id");
-            String startArea_type = AreaEnum.KLHJ.getCode();
             JSONObject param1 = new JSONObject();
             param1.put("material_id", material_id);
             param1.put("area_type", startArea_type);
@@ -133,12 +128,10 @@ public class CallMaterialServiceImpl implements CallMaterialService {
             jsonObject.put("next_point_code", next_point_code);
             jsonObject.put("create_mode", "03");
             //批次 物料，客户要从排产单里面去取
-            jsonObject.put("pcsn", "pcsn");
+           // jsonObject.put("pcsn", "pcsn");
-            JSONObject produceInfoByCode = this.getProduceInfoByCode(next_point_code);
+            //JSONObject produceInfoByCode = this.getProduceInfoByCode(next_point_code);
-            jsonObject.put("material_id", produceInfoByCode.getString("material_id"));
+            jsonObject.put("material_id", material_id);
-            jsonObject.put("cust_id", produceInfoByCode.getString("cust_id"));
+            //jsonObject.put("producetask_id", produceInfoByCode.getString("producetask_id"));
-            jsonObject.put("stewing_time", produceInfoByCode.getString("stewing_time"));
-            jsonObject.put("producetask_id", produceInfoByCode.getString("producetask_id"));
             jsonObject.put("is_full", is_full);
             callMaterialTask.createTask((JSONObject) JSON.toJSON(jsonObject));
         }

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java

@@ -179,9 +179,6 @@ public class CallMaterialTask extends AbstractAcsTask {
         if (StrUtil.isEmpty(material_id)) {
             throw new BadRequestException("物料标识不能为空！");
         }
-        if (StrUtil.isEmpty(cust_id)) {
-            throw new BadRequestException("客户不能为空！");
-        }
         if (StrUtil.isEmpty(create_mode)) {
             throw new BadRequestException("创建方式不能为空！");
         }