分拣机械手工单修改

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java

@@ -867,7 +867,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
                 if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) {
                     ProduceshiftorderDto dto = produceshiftorderService.findByCode(order_No);
                     if (this.mode == 4) {
-                        dto.setOrder_status("0");
+                        dto.setOrder_status("1");
                     } else if (this.mode == 9) {
                         dto.setOrder_status("2");
                     }

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java

@@ -857,7 +857,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
                 if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) {
                     ProduceshiftorderDto dto = produceshiftorderService.findByCode(order_No);
                     if (this.mode == 4) {
-                        dto.setOrder_status("0");
+                        dto.setOrder_status("1");
                     } else if (this.mode == 9) {
                         dto.setOrder_status("2");
                     }

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java

@@ -236,7 +236,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
                 case 4:
                     //叫料
                     if (!requireSucess && this.move == 0) {
-                        applyIn();
+                        applyMaterialOut();
                     }
                     break;
                 case 5:
@@ -540,6 +540,36 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
         }
     }
 
+    /**
+     * 申请物料出库
+     *
+     * @param
+     */
+    public synchronized boolean applyMaterialOut() {
+        Date date = new Date();
+        if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
+            log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
+            return false;
+        } else {
+            this.instruction_require_time = date;
+            JSONObject json = new JSONObject();
+
+            json.put("device_code",device_code);
+            json.put("type","2");
+            json.put("is_full","1");
+
+            HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
+            if (ObjectUtil.isNotEmpty(result)) {
+                JSONObject jsonObject = JSONObject.parseObject(result.body());
+                if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) {
+                    this.writing(this.mode);
+                    this.setRequireSucess(true);
+                }
+            }
+            return true;
+        }
+    }
+
     /**
      * 申请入库
      *

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

@@ -36,7 +36,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
 
     @Override
     public Map action(JSONArray arr) {
-        String api = "api/wms/updateDeviceGoods";
+        String api = "api/wms/action";
         return AcsUtil.notifyAcs(api, arr);
     }
 

wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java

@@ -15,10 +15,13 @@ import org.nl.utils.SpringContextHolder;
 import org.nl.wms.ext.acs.service.AcsToWmsService;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl;
+import org.nl.wms.pdm.service.DeviceService;
 import org.nl.wms.pdm.service.ProducetaskService;
+import org.nl.wms.pdm.service.dto.DeviceDto;
 import org.nl.wms.pdm.service.dto.ProducetaskDto;
 import org.nl.wms.sch.AcsUtil;
 import org.nl.wql.WQL;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -55,6 +58,9 @@ import javax.servlet.http.HttpServletRequest;
 @Slf4j
 public class ProducetaskServiceImpl implements ProducetaskService {
 
+    @Autowired
+    DeviceService deviceService;
+
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
         String search = MapUtil.getStr(whereJson, "search");
@@ -283,13 +289,15 @@ public class ProducetaskServiceImpl implements ProducetaskService {
         if (ObjectUtil.isNotEmpty(jo)) {
             throw new BadRequestException("该设备存在未完成的工单，不能下发！");
         }
+
+        DeviceDto dto = deviceService.findById(Long.valueOf(device_id));
         JSONObject taskObj = new JSONObject();
         //假如是包装的三台机械手，是将设备当作工单设备
         //假如是压机下料的机械手，则是将对接为当作工单设备
-        if (StrUtil.equals(device_id, "1518136519804719104") || StrUtil.equals("1518136611341209600", device_id) || StrUtil.equals("1544608176471674880", device_id)) {
+        if (StrUtil.equals(dto.getDevice_code(), "FJJXS1") || StrUtil.equals("FJJXS2", dto.getDevice_code()) || StrUtil.equals("FJJXS3", dto.getDevice_code())) {
-            taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "4").addParam("producetask_id", producetask_id).process().uniqueResult(0);
-        } else {
             taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "3").addParam("producetask_id", producetask_id).process().uniqueResult(0);
+        } else {
+            taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "4").addParam("producetask_id", producetask_id).process().uniqueResult(0);
         }
 
         taskObj.put("product_code", "wms");