no message

wms/hd/nladmin-system/src/main/java/org/nl/wms/common/PointUpdateUtil.java

@@ -4,17 +4,24 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.exception.BadRequestException;
+import org.nl.modules.system.service.impl.ParamServiceImpl;
+import org.nl.utils.SpringContextHolder;
 import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl;
 import org.nl.wql.WQL;
 import org.nl.wql.core.bean.WQLObject;
+import org.springframework.http.HttpStatus;
 
 public class PointUpdateUtil {
     public static void updatePoint(JSONArray arr) {
         WmsToAcsServiceImpl wmsToAcsServiceImpl = new WmsToAcsServiceImpl();
-
+        String isConnect = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("IS_CONNECT_ACS").getValue();
+        if (StrUtil.equals("0", isConnect)) {
+            return;
+        }
         JSONObject joo = wmsToAcsServiceImpl.queryPointStatus(arr);
         JSONArray pointarr = joo.getJSONArray("data");
 
+
         //JSONArray pointarr =new JSONArray();
         WQLObject pointTable = WQLObject.getWQLObject("sch_base_point");
         for (int i = 0; i < pointarr.size(); i++) {

wms/hd/nladmin-system/src/main/java/org/nl/wms/common/SortingUtil.java

@@ -40,6 +40,8 @@ public class SortingUtil {
             JSONObject jo = pointArr.getJSONObject(i);
             String Sl_vehicle_code = jo.getString("vehicle_code");
             record_id = mstObj.getString("record_id");
+            if(StrUtil.isEmpty(Sl_vehicle_code))
+                continue;
             JSONObject dtljo = ehicleRelaRecordmstdtl.query("record_id='" + record_id + "' and  vehicle_code ='" + Sl_vehicle_code + "'").uniqueResult(0);
             if (ObjectUtil.isEmpty(dtljo)) {
                 JSONObject groupObj = groupTable.query("vehicle_code='" + Sl_vehicle_code + "'", "create_time desc").uniqueResult(0);

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java

@@ -9,21 +9,16 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.nl.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.utils.SecurityUtils;
-import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.ext.acs.service.WmsToJnService;
-import org.nl.wms.sch.AcsUtil;
 import org.nl.wql.WQL;
 import org.nl.wql.core.bean.WQLObject;
-import org.nl.wql.core.engine.object.WO;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.Map;
 
 @Service
@@ -229,7 +224,9 @@ public class WmsToJnServiceImpl implements WmsToJnService {
     public Map<String, Object> feedBackPackage(Map whereJson) {
         //木托盘号码
         String vehicle_code = (String) whereJson.get("vehicle_code");
-
+        if (StrUtil.isEmpty(vehicle_code)){
+            throw new BadRequestException("托盘编码不能为空！");
+        }
         return null;
     }
 

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

@@ -16,6 +16,7 @@ import org.nl.wms.BussConstant;
 import org.nl.wms.WorkProcedureEnum;
 import org.nl.wms.common.StructFindUtil;
 import org.nl.wms.ext.acs.service.WmsToJnService;
+import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.AreaEnum;
 import org.nl.wms.sch.manage.BillTypeEnum;
@@ -33,11 +34,10 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.HashMap;
 
 @Service
-@RequiredArgsConstructor
 @Slf4j
 public class SendMaterialTask extends AbstractAcsTask {
     private final String THIS_CLASS = SendMaterialTask.class.getName();
-    private final WmsToJnService wmsToJnService;
+
 
     @Override
     @Transactional
@@ -121,6 +121,11 @@ public class SendMaterialTask extends AbstractAcsTask {
             startPointObj.put("vehicle_code", "");
             pointTab.update(startPointObj);
             taskTab.update(jsonTask);
+            //调用接口反馈给嘉耐 搬运任务
+            JSONObject jo = new JSONObject();
+            jo.put("task_id", task_id);
+            WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl();
+           // wmsToJnServiceImpl.feedBackCarryRecord(jo);
         }
 
     }
@@ -349,10 +354,7 @@ public class SendMaterialTask extends AbstractAcsTask {
                 groupInfo.put("material_move_id", task_id);
                 groupTable.update(groupInfo);
             }
-            //调用接口反馈给嘉耐 搬运任务
+
-            JSONObject param = new JSONObject();
-            param.put("task_id", task_id);
-            wmsToJnService.feedBackCarryRecord(param);
         }
         return task_id;
     }

wms/qd/src/views/wms/pdm/produceTask/index.vue

@@ -172,7 +172,7 @@
             <el-input-number v-model="form.seq_no" controls-position="right" style="width: 200px;text-align: left" :min="1" />
             <!--            <el-input-number v-model="form.seq_no" :precision="0" :step="10" :min="0" style="width: 200px;" />-->
           </el-form-item>
-          <el-form-item label="静置时间" prop="stewing_time">
+          <el-form-item v-if="false" label="静置时间" prop="stewing_time">
             <el-input v-model="form.stewing_time" :rows="3" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="计划生产数量" prop="plan_qty">
@@ -180,7 +180,7 @@
           </el-form-item>
 
           <el-form-item label="班次" prop="classes">
-            <label slot="label">名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称</label>
+            <label slot="label">班&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</label>
             <el-input v-model="form.classes" style="width: 200px; " />
           </el-form-item>
           <el-form-item label="计划单号" prop="ext_shoporder_no">