修改

nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/CasingController.java

@@ -0,0 +1,40 @@
+package org.nl.wms.pda.mps.rest;
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.logging.annotation.Log;
+import org.nl.wms.pda.mps.service.CasingService;
+import org.nl.wms.pda.mps.service.EmptyTubeService;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "子卷套管")
+@RequestMapping("api/pda/casing")
+@Slf4j
+public class CasingController {
+
+    private final CasingService casingService;
+
+    @PostMapping("/queryMaterialInfo")
+    @Log("分切计划初始化查询")
+    @ApiOperation("分切计划初始化查询")
+    public ResponseEntity<Object> queryMaterialInfo(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(casingService.queryMaterialInfo(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/confirm")
+    @Log("套轴确认")
+    @ApiOperation("套轴确认")
+    public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(casingService.confirm(whereJson), HttpStatus.OK);
+    }
+}

nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/ShippingController.java

@@ -0,0 +1,47 @@
+package org.nl.wms.pda.mps.rest;
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.logging.annotation.Log;
+import org.nl.wms.pda.mps.service.CasingService;
+import org.nl.wms.pda.mps.service.ShippingService;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "子卷配送")
+@RequestMapping("api/pda/shipping")
+@Slf4j
+public class ShippingController {
+
+    private final ShippingService shippingService;
+
+    @PostMapping("/queryMaterialInfo")
+    @Log("分切计划初始化查询")
+    @ApiOperation("分切计划初始化查询")
+    public ResponseEntity<Object> queryMaterialInfo(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(shippingService.queryMaterialInfo(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/needVehicle")
+    @Log("呼叫载具")
+    @ApiOperation("呼叫载具")
+    public ResponseEntity<Object> needVehicle(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(shippingService.needVehicle(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/confirm")
+    @Log("套轴确认")
+    @ApiOperation("套轴确认")
+    public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(shippingService.confirm(whereJson), HttpStatus.OK);
+    }
+}

nladmin-system/src/main/java/org/nl/wms/pda/mps/service/CasingService.java

@@ -0,0 +1,21 @@
+package org.nl.wms.pda.mps.service;
+
+import com.alibaba.fastjson.JSONObject;
+
+public interface CasingService {
+
+    /**
+     * 分切计划初始化查询
+     * @param whereJson /
+     * @return JSONObject
+     */
+    JSONObject queryMaterialInfo(JSONObject whereJson);
+
+    /**
+     * 套轴确认
+     * @param whereJson /
+     * @return JSONObject
+     */
+    JSONObject confirm(JSONObject whereJson);
+
+}

nladmin-system/src/main/java/org/nl/wms/pda/mps/service/ShippingService.java

@@ -0,0 +1,28 @@
+package org.nl.wms.pda.mps.service;
+
+import com.alibaba.fastjson.JSONObject;
+
+public interface ShippingService {
+
+    /**
+     * 分切计划初始化查询
+     * @param whereJson /
+     * @return JSONObject
+     */
+    JSONObject queryMaterialInfo(JSONObject whereJson);
+
+    /**
+     * 呼叫载具
+     * @param whereJson /
+     * @return JSONObject
+     */
+    JSONObject needVehicle(JSONObject whereJson);
+
+    /**
+     * 配送确认
+     * @param whereJson /
+     * @return JSONObject
+     */
+    JSONObject confirm(JSONObject whereJson);
+
+}

nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/CasingServiceImpl.java

@@ -0,0 +1,33 @@
+package org.nl.wms.pda.mps.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.wms.pda.mps.service.BakingService;
+import org.nl.wms.pda.mps.service.CasingService;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class CasingServiceImpl implements CasingService {
+
+
+    @Override
+    public JSONObject queryMaterialInfo(JSONObject whereJson) {
+        JSONObject result = new JSONObject();
+        result.put("code", "1");
+        result.put("desc", "查询成功");
+        return result;
+    }
+
+    @Override
+    public JSONObject confirm(JSONObject whereJson) {
+        JSONObject result = new JSONObject();
+        result.put("code", "1");
+        result.put("desc", "查询成功");
+        return result;
+    }
+
+
+}

nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java

@@ -0,0 +1,32 @@
+package org.nl.wms.pda.mps.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.wms.pda.mps.service.CasingService;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class ShippingServiceImpl implements CasingService {
+
+
+    @Override
+    public JSONObject queryMaterialInfo(JSONObject whereJson) {
+        JSONObject result = new JSONObject();
+        result.put("code", "1");
+        result.put("desc", "查询成功");
+        return result;
+    }
+
+    @Override
+    public JSONObject confirm(JSONObject whereJson) {
+        JSONObject result = new JSONObject();
+        result.put("code", "1");
+        result.put("desc", "查询成功");
+        return result;
+    }
+
+
+}