rev wms接口

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java

@@ -125,14 +125,6 @@ public class AcsToWmsController {
         return new ResponseEntity<>(acsToWmsService.reverseGroup(whereJson), HttpStatus.OK);
     }
 
-    @SaIgnore
-    @PostMapping("/ispackage")
-    @Log("ACS给WMS请求是否优先包装")
-    @ApiOperation("ACS给WMS请求是否优先包装")
-    public ResponseEntity<Object> ispackage(@RequestBody Map whereJson) {
-        return new ResponseEntity<>(acsToWmsService.ispackage(whereJson), HttpStatus.OK);
-    }
-
     @PostMapping("/getEmptyVehicle_code")
     @Log("获取空木托盘号")
     @ApiOperation("获取空木托盘号")
@@ -174,14 +166,6 @@ public class AcsToWmsController {
         return new ResponseEntity<>(acsToWmsService.againApply(task_id), HttpStatus.OK);
     }
 
-    @PostMapping("/feedbackVehicleType")
-    @Log("更新覆膜机条码")
-    @ApiOperation("更新覆膜机条码")
-    @SaIgnore
-    public ResponseEntity<Object> feedbackVehicleType(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(acsToWmsService.feedbackVehicleType(param), HttpStatus.OK);
-    }
-
     @PostMapping("/getVehicleInfo")
     @Log("根据载具编码获组盘信息")
     @ApiOperation("根据载具编码获组盘信息")
@@ -198,14 +182,6 @@ public class AcsToWmsController {
         return new ResponseEntity<>(acsToWmsService.outKiln(whereJson), HttpStatus.OK);
     }
 
-    @PostMapping("/mark")
-    @Log("打印唛头")
-    @ApiOperation("打印唛头")
-    @SaIgnore
-    public ResponseEntity<Object> mark(@RequestBody JSONObject whereJson) {
-        return new ResponseEntity<>(acsToWmsService.mark(whereJson), HttpStatus.OK);
-    }
-
     @PostMapping("/inKiln")
     @Log("反馈进窑分配")
     @ApiOperation("反馈进窑分配")

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java

@@ -67,13 +67,6 @@ public interface AcsToWmsService {
      */
     JSONObject manipulatorApply(JSONObject whereJson);
 
-    /**
-     * ACS给WMS请求是否优先包装
-     * @param whereJson
-     * @return
-     */
-    Map<String, Object> ispackage(Map whereJson);
-
     /**
      * 获取空木托盘号
      * @param whereJson
@@ -110,14 +103,9 @@ public interface AcsToWmsService {
      */
     Map<String, Object> getVehicleInfoByDeviceCode(Map jsonObject);
 
-    JSONObject feedbackVehicleType(JSONObject param);
-
     JSONObject getVehicleInfo(JSONObject whereJson);
 
     JSONObject outKiln(JSONObject whereJson);
 
-
-    JSONObject mark(JSONObject whereJson);
-
     JSONObject inKiln(JSONObject param);
 }

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -334,33 +334,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         return this.apply(param);
     }
 
-    /**
-     * ACS给WMS请求是否优先包装
-     *
-     * @param jsonObject
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> ispackage(Map jsonObject) {
-        String vehicle_code = (String) jsonObject.get("vehicle_code");
-        if (StrUtil.isEmpty(vehicle_code)) {
-            throw new BadRequestException("托盘条码不能为空！");
-        }
-        // 组盘表 - 对应的是钢托盘
-        JSONObject vehicleObj = WQLObject.getWQLObject("st_buss_vehiclegroup").query("vehicle_code = '" + vehicle_code + "'", "create_time desc").uniqueResult(0);
-        if (ObjectUtil.isEmpty(vehicleObj)) {
-            throw new BadRequestException("未找到托盘号为'" + vehicle_code + "'的组盘信息！");
-        }
-        // 获取工单
-        String workorder_id = vehicleObj.getString("producetask_id"); // workorder_id
-        JSONObject taskObj = WQLObject.getWQLObject("PDM_BD_WorkOrder").query("workorder_id='" + workorder_id + "'").uniqueResult(0);
-        //1代表去出窑，2 是优先包装
-        JSONObject returnjo = new JSONObject();
-        returnjo.put("is_package", taskObj.getString("is_package"));
-        return returnjo;
-    }
-
     /**
      * 获取空木托盘号
      *
@@ -580,34 +553,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         return result;
     }
 
-    @Override
-    public JSONObject feedbackVehicleType(JSONObject param) {
-        String point_code = param.getString("device_code");
-        if (StrUtil.isBlank(point_code)) {
-            throw new BadRequestException("点位不能为空！");
-        }
-        String vehicle_type = param.getString("vehicle_type");
-        if (StrUtil.isBlank(vehicle_type)) {
-            throw new BadRequestException("载具类型不能为空！");
-        }
-
-        JSONObject update = new JSONObject();
-        if ("0".equals(vehicle_type)) {
-            update.put("vehicle_type", "");
-        } else {
-            update.put("vehicle_type", String.valueOf(Integer.parseInt(vehicle_type) + 2));
-        }
-        WQLObject
-                .getWQLObject("sch_base_point")
-                .update(update, "point_code = '" + point_code + "'");
-
-
-        JSONObject result = new JSONObject();
-        result.put("status", HttpStatus.OK.value());
-        result.put("message", "反馈成功！");
-        return result;
-    }
-
     @Override
     public JSONObject getVehicleInfo(JSONObject whereJson) {
         String point_code = whereJson.getString("device_code");
@@ -697,59 +642,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         return null;
     }
 
-    @Override
-    public JSONObject mark(JSONObject whereJson) {
-        int vehicle_type = whereJson.getIntValue("vehicle_type");
-        if (vehicle_type == 0) {
-            throw new BadRequestException("载具类型不能为空！");
-        }
-        vehicle_type = vehicle_type + 2;
-        String vehicle_code = TaskUtils.formatVehicleCode(whereJson.getString("vehicle_code"));
-        if ("0000".equals(vehicle_code)) {
-            throw new BadRequestException("载具编码不能为空！");
-        }
-
-        JSONObject info = WQL
-                .getWO("ACS_TO_WMS")
-                .addParam("flag", "3")
-                .addParam("vehicle_type", String.valueOf(vehicle_type))
-                .addParam("vehicle_code", vehicle_code)
-                .process()
-                .uniqueResult(0);
-
-        if (ObjectUtil.isNotEmpty(info)) {
-
-            JSONObject data = new JSONObject();
-            data.put("is_package", info.getString("is_package"));
-            String material_code = info.getString("material_code");
-            data.put("order_code", material_code.substring(11, 16));
-            data.put("customer", material_code.substring(16, 21));
-            data.put("product_name", info.getString("furnace") + info.getString("material_brick_type"));
-            data.put("product_grade", info.getString("product_grade"));
-
-            double single_weight = info.getDoubleValue("single_weight");
-            data.put("single_weight", String.valueOf(single_weight));
-            int qty = info.getIntValue("qty");
-            data.put("qty", String.valueOf(qty));
-            int weight = info.getIntValue("weight");
-            if (weight == 0) {
-                weight = Math.toIntExact(Math.round(single_weight * qty));
-            }
-            data.put("weight", String.valueOf(weight));
-            data.put("date", DateUtil.format(new Date(), "yyyyMMdd"));
-            data.put("material_code", material_code.substring(0, 11));
-            data.put("brick_type", info.getString("brick_type"));
-
-            JSONObject result = new JSONObject();
-            result.put("status", HttpStatus.OK.value());
-            result.put("message", "信息已下发！");
-            result.put("data", data);
-            return result;
-        } else {
-            throw new BadRequestException("[" + VehicleType.get(String.valueOf(vehicle_type)).label() + "] [" + vehicle_code + "] 无信息！");
-        }
-    }
-
     @Override
     public JSONObject inKiln(JSONObject param) {
         String vehicle_code = TaskUtils.formatVehicleCode(param.getString("vehicle_code"));