add：一体机

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpCheckController.java

@@ -0,0 +1,94 @@
+package org.nl.wms.storage_manage.pda.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiOperation;
+import org.nl.common.anno.Log;
+import org.nl.wms.storage_manage.pda.service.PdaStBcpCheckService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * <p>
+ * 一体机半成品盘点 前端控制器
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2023-06-28
+ */
+@RestController
+@RequestMapping("/api/pda/bcp/check")
+public class PdaStBcpCheckController {
+
+    @Autowired
+    private PdaStBcpCheckService pdaStBcpCheckService;
+
+    @PostMapping("/getBcpStor")
+    @Log("查询半成品仓库下拉框")
+    @ApiOperation("查询半成品仓库下拉框")
+    public ResponseEntity<Object> getBcpStor() {
+        return new ResponseEntity<>(pdaStBcpCheckService.getBcpStor(), HttpStatus.OK);
+    }
+
+    @PostMapping("/getMaterialIvt")
+    @Log("货位物料查询")
+    @ApiOperation("货位物料查询")
+    public ResponseEntity<Object> getMaterialIvt(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpCheckService.getMaterialIvt(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/create")
+    @Log("生成盘点单")
+    @ApiOperation("生成盘点单")
+    public ResponseEntity<Object> create(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpCheckService.create(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/getDtlAll")
+    @Log("半成品盘点查询")
+    @ApiOperation("半成品盘点查询")
+    public ResponseEntity<Object> getDtlAll(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpCheckService.getDtlAll(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/getPoint")
+    @Log("查询盘点位下拉框")
+    @ApiOperation("查询盘点位下拉框")
+    public ResponseEntity<Object> getPoint() {
+        return new ResponseEntity<>(pdaStBcpCheckService.getPoint(), HttpStatus.OK);
+    }
+
+    @PostMapping("/sendTask")
+    @Log("下发")
+    @ApiOperation("下发")
+    public ResponseEntity<Object> sendTask(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpCheckService.sendTask(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/confirm")
+    @Log("盘点确认")
+    @ApiOperation("盘点确认")
+    public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpCheckService.confirm(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/confirmOffer")
+    @Log("实盘为准")
+    @ApiOperation("实盘为准")
+    public ResponseEntity<Object> confirmOffer(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpCheckService.confirmOffer(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/confirmFinance")
+    @Log("财务为准")
+    @ApiOperation("财务为准")
+    public ResponseEntity<Object> confirmFinance(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpCheckService.confirmFinance(whereJson), HttpStatus.OK);
+    }
+}
+

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpInController.java

@@ -0,0 +1,87 @@
+package org.nl.wms.storage_manage.pda.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiOperation;
+import org.nl.common.anno.Log;
+import org.nl.wms.storage_manage.pda.service.PdaStBcpInService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * <p>
+ * 一体机半成品入库 前端控制器
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2023-06-27
+ */
+@RestController
+@RequestMapping("/api/pda/bcp/in")
+public class PdaStBcpInController {
+
+    @Autowired
+    private PdaStBcpInService pdaStBcpInService;
+
+    @PostMapping("/getBcpStor")
+    @Log("查询半成品仓库下拉框")
+    @ApiOperation("查询半成品仓库下拉框")
+    public ResponseEntity<Object> getBcpStor() {
+        return new ResponseEntity<>(pdaStBcpInService.getBcpStor(), HttpStatus.OK);
+    }
+
+    @PostMapping("/getBillType")
+    @Log("查询单据类型下拉框")
+    @ApiOperation("查询单据类型下拉框")
+    public ResponseEntity<Object> getBillType() {
+        return new ResponseEntity<>(pdaStBcpInService.getBillType(), HttpStatus.OK);
+    }
+
+    @PostMapping("/getPoint")
+    @Log("查询入库点下拉框")
+    @ApiOperation("查询入库点下拉框")
+    public ResponseEntity<Object> getPoint() {
+        return new ResponseEntity<>(pdaStBcpInService.getPoint(), HttpStatus.OK);
+    }
+
+    @PostMapping("/getMaterial")
+    @Log("查询物料")
+    @ApiOperation("查询物料")
+    public ResponseEntity<Object> getMaterial(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpInService.getMaterial(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/callVehicle")
+    @Log("呼叫空载具")
+    @ApiOperation("呼叫空载具")
+    public ResponseEntity<Object> callVehicle() {
+        return new ResponseEntity<>(pdaStBcpInService.callVehicle(), HttpStatus.OK);
+    }
+
+    @PostMapping("/createIn")
+    @Log("确认入库")
+    @ApiOperation("确认入库")
+    public ResponseEntity<Object> createIn(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpInService.createIn(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/getAll")
+    @Log("半成品入库管理查询")
+    @ApiOperation("半成品入库管理查询")
+    public ResponseEntity<Object> getAll(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpInService.getAll(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/confirm")
+    @Log("强制确认")
+    @ApiOperation("强制确认")
+    public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpInService.confirm(whereJson), HttpStatus.OK);
+    }
+}
+

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpOutController.java

@@ -0,0 +1,80 @@
+package org.nl.wms.storage_manage.pda.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiOperation;
+import org.nl.common.anno.Log;
+import org.nl.wms.storage_manage.pda.service.PdaStBcpOutService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * <p>
+ * 一体机半成品出库 前端控制器
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2023-06-28
+ */
+@RestController
+@RequestMapping("/api/pda/bcp/out")
+public class PdaStBcpOutController {
+
+    @Autowired
+    private PdaStBcpOutService pdaStBcpOutService;
+
+    @PostMapping("/getBcpStor")
+    @Log("查询半成品仓库下拉框")
+    @ApiOperation("查询半成品仓库下拉框")
+    public ResponseEntity<Object> getBcpStor() {
+        return new ResponseEntity<>(pdaStBcpOutService.getBcpStor(), HttpStatus.OK);
+    }
+
+    @PostMapping("/getBillType")
+    @Log("查询单据类型下拉框")
+    @ApiOperation("查询单据类型下拉框")
+    public ResponseEntity<Object> getBillType() {
+        return new ResponseEntity<>(pdaStBcpOutService.getBillType(), HttpStatus.OK);
+    }
+
+    @PostMapping("/getPoint")
+    @Log("查询出库点下拉框")
+    @ApiOperation("查询出库点下拉框")
+    public ResponseEntity<Object> getPoint() {
+        return new ResponseEntity<>(pdaStBcpOutService.getPoint(), HttpStatus.OK);
+    }
+
+    @PostMapping("/getMaterial")
+    @Log("物料选择")
+    @ApiOperation("物料选择")
+    public ResponseEntity<Object> getMaterial(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpOutService.getMaterial(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/createIn")
+    @Log("确认入库")
+    @ApiOperation("确认入库")
+    public ResponseEntity<Object> createIn(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpOutService.createIn(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/getAll")
+    @Log("半成品出库管理查询")
+    @ApiOperation("半成品出库管理查询")
+    public ResponseEntity<Object> getAll(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpOutService.getAll(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/confirm")
+    @Log("强制确认")
+    @ApiOperation("强制确认")
+    public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpOutService.confirm(whereJson), HttpStatus.OK);
+    }
+}
+

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpShutController.java

@@ -0,0 +1,60 @@
+package org.nl.wms.storage_manage.pda.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiOperation;
+import org.nl.common.anno.Log;
+import org.nl.wms.storage_manage.pda.service.PdaStBcpShutService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * <p>
+ * 一体机半成品拼盘 前端控制器
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2023-06-27
+ */
+@RestController
+@RequestMapping("/api/pda/bcp/shut")
+public class PdaStBcpShutController {
+
+    @Autowired
+    private PdaStBcpShutService pdaStBcpShutService;
+
+    @PostMapping("/getBcpStor")
+    @Log("查询半成品仓库下拉框")
+    @ApiOperation("查询半成品仓库下拉框")
+    public ResponseEntity<Object> getBcpStor() {
+        return new ResponseEntity<>(pdaStBcpShutService.getBcpStor(), HttpStatus.OK);
+    }
+
+    @PostMapping("/getBillType")
+    @Log("单据类型下拉框")
+    @ApiOperation("单据类型下拉框")
+    public ResponseEntity<Object> getBillType() {
+        return new ResponseEntity<>(pdaStBcpShutService.getBillType(), HttpStatus.OK);
+    }
+
+    @PostMapping("/getdtl")
+    @Log("半成品拼盘页面")
+    @ApiOperation("半成品拼盘页面")
+    public ResponseEntity<Object> getdtl(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpShutService.getdtl(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/confirm")
+    @Log("拼盘完成")
+    @ApiOperation("拼盘完成")
+    public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStBcpShutService.confirm(whereJson), HttpStatus.OK);
+    }
+
+}
+

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStCpInController.java

@@ -0,0 +1,80 @@
+package org.nl.wms.storage_manage.pda.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiOperation;
+import org.nl.common.anno.Log;
+import org.nl.wms.storage_manage.pda.service.PdaStCpInService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * <p>
+ * 一体机成品入库 前端控制器
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2023-06-27
+ */
+@RestController
+@RequestMapping("/api/pda/cp/in")
+public class PdaStCpInController {
+
+    @Autowired
+    private PdaStCpInService pdaStCpInService;
+
+    @PostMapping("/getBcpStor")
+    @Log("查询成品仓库下拉框")
+    @ApiOperation("查询成品仓库下拉框")
+    public ResponseEntity<Object> getBcpStor() {
+        return new ResponseEntity<>(pdaStCpInService.getBcpStor(), HttpStatus.OK);
+    }
+
+    @PostMapping("/getBillType")
+    @Log("查询单据类型下拉框")
+    @ApiOperation("查询单据类型下拉框")
+    public ResponseEntity<Object> getBillType() {
+        return new ResponseEntity<>(pdaStCpInService.getBillType(), HttpStatus.OK);
+    }
+
+    @PostMapping("/getPoint")
+    @Log("查询入库点下拉框")
+    @ApiOperation("查询入库点下拉框")
+    public ResponseEntity<Object> getPoint() {
+        return new ResponseEntity<>(pdaStCpInService.getPoint(), HttpStatus.OK);
+    }
+
+    @PostMapping("/getMaterial")
+    @Log("查询入库点下拉框")
+    @ApiOperation("查询入库点下拉框")
+    public ResponseEntity<Object> getMaterial(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStCpInService.getMaterial(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/confirmIn")
+    @Log("确认入库")
+    @ApiOperation("确认入库")
+    public ResponseEntity<Object> confirmIn(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStCpInService.confirmIn(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/getAll")
+    @Log("成品入库查询")
+    @ApiOperation("成品入库查询")
+    public ResponseEntity<Object> getAll(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStCpInService.getAll(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/confirm")
+    @Log("强制确认")
+    @ApiOperation("强制确认")
+    public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaStCpInService.confirm(whereJson), HttpStatus.OK);
+    }
+}
+

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/PdaStBcpCheckService.java

@@ -0,0 +1,75 @@
+package org.nl.wms.storage_manage.pda.service;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * <p>
+ * 一体机半成品盘点 服务类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2023-06-27
+ */
+public interface PdaStBcpCheckService {
+
+    /**
+     *  查询半成品仓库下拉框
+     * @return JSONObject /
+     */
+    JSONObject getBcpStor();
+
+    /**
+     * 货位物料查询
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject getMaterialIvt(JSONObject whereJson);
+
+    /**
+     * 生成盘点单
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject create(JSONObject whereJson);
+
+    /**
+     * 半成品盘点查询
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject getDtlAll(JSONObject whereJson);
+
+    /**
+     *  查询盘点位下拉框
+     * @return JSONObject /
+     */
+    JSONObject getPoint();
+
+    /**
+     * 下发
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject sendTask(JSONObject whereJson);
+
+    /**
+     * 盘点确认
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject confirm(JSONObject whereJson);
+
+    /**
+     * 实盘为准
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject confirmOffer(JSONObject whereJson);
+
+    /**
+     * 财务为准
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject confirmFinance(JSONObject whereJson);
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/PdaStBcpInService.java

@@ -0,0 +1,66 @@
+package org.nl.wms.storage_manage.pda.service;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * <p>
+ * 一体机半成品入库 服务类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2023-06-27
+ */
+public interface PdaStBcpInService {
+
+    /**
+     *  查询半成品仓库下拉框
+     * @return JSONObject /
+     */
+    JSONObject getBcpStor();
+
+    /**
+     *  查询单据类型下拉框
+     * @return JSONObject /
+     */
+    JSONObject getBillType();
+
+    /**
+     *  查询物料
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject getMaterial(JSONObject whereJson);
+
+    /**
+     *  查询入库点下拉框
+     * @return JSONObject /
+     */
+    JSONObject getPoint();
+
+    /**
+     *  呼叫空载具
+     * @return JSONObject /
+     */
+    JSONObject callVehicle();
+
+    /**
+     *  确认入库
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject createIn(JSONObject whereJson);
+
+    /**
+     *  半成品入库管理查询
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject getAll(JSONObject whereJson);
+
+    /**
+     *  强制确认
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject confirm(JSONObject whereJson);
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/PdaStBcpOutService.java

@@ -0,0 +1,60 @@
+package org.nl.wms.storage_manage.pda.service;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * <p>
+ * 一体机半成品出库 服务类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2023-06-28
+ */
+public interface PdaStBcpOutService {
+
+    /**
+     *  查询半成品仓库下拉框
+     * @return JSONObject /
+     */
+    JSONObject getBcpStor();
+
+    /**
+     *  查询单据类型下拉框
+     * @return JSONObject /
+     */
+    JSONObject getBillType();
+
+    /**
+     *  物料选择
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject getMaterial(JSONObject whereJson);
+
+    /**
+     *  查询出库点下拉框
+     * @return JSONObject /
+     */
+    JSONObject getPoint();
+
+    /**
+     *  确认入库
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject createIn(JSONObject whereJson);
+
+    /**
+     *  半成品出库管理查询
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject getAll(JSONObject whereJson);
+
+    /**
+     *  强制确认
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject confirm(JSONObject whereJson);
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/PdaStBcpShutService.java

@@ -0,0 +1,40 @@
+package org.nl.wms.storage_manage.pda.service;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * <p>
+ * 一体机半成品拼盘 服务类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2023-06-27
+ */
+public interface PdaStBcpShutService {
+
+    /**
+     *  查询半成品仓库下拉框
+     * @return JSONObject /
+     */
+    JSONObject getBcpStor();
+
+    /**
+     *  单据类型下拉框
+     * @return JSONObject /
+     */
+    JSONObject getBillType();
+
+    /**
+     * 半成品拼盘页面
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject getdtl(JSONObject whereJson);
+
+    /**
+     * 拼盘完成
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject confirm(JSONObject whereJson);
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/PdaStCpInService.java

@@ -0,0 +1,60 @@
+package org.nl.wms.storage_manage.pda.service;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * <p>
+ * 一体机成品入库 服务类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2023-06-27
+ */
+public interface PdaStCpInService {
+
+    /**
+     *  查询成品仓库下拉框
+     * @return JSONObject /
+     */
+    JSONObject getBcpStor();
+
+    /**
+     *  查询单据类型下拉框
+     * @return JSONObject /
+     */
+    JSONObject getBillType();
+
+    /**
+     *  查询入库点下拉框
+     * @return JSONObject /
+     */
+    JSONObject getPoint();
+
+    /**
+     * 查询入库点下拉框
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject getMaterial(JSONObject whereJson);
+
+    /**
+     * 确认入库
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject confirmIn(JSONObject whereJson);
+
+    /**
+     * 成品入库查询
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject getAll(JSONObject whereJson);
+
+    /**
+     * 强制确认
+     * @param whereJson /
+     * @return JSONObject /
+     */
+    JSONObject confirm(JSONObject whereJson);
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpCheckServiceImpl.java

@@ -0,0 +1,98 @@
+package org.nl.wms.storage_manage.pda.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
+import org.nl.wms.storage_manage.IOSEnum;
+import org.nl.wms.storage_manage.pda.service.PdaStBcpCheckService;
+import org.nl.wms.system_manage.service.dict.ISysDictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 一体机半成品盘点 服务实现类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2023-06-27
+ */
+@Service
+public class PdaStBcpCheckServiceImpl implements PdaStBcpCheckService {
+
+    @Autowired
+    private IStIvtStructattrService structattrService; // 仓位服务
+
+    @Autowired
+    private IStIvtBsrealstorattrService storattrService; // 实物属性服务
+
+    @Autowired
+    private ISysDictService iSysDictService; // 字典服务
+
+    @Override
+    public JSONObject getBcpStor() {
+        List<StIvtBsrealstorattr> storList = storattrService.list(
+                new QueryWrapper<StIvtBsrealstorattr>().lambda()
+                        .eq(StIvtBsrealstorattr::getIs_used, IOSEnum.IS_USED.code("是"))
+                        .eq(StIvtBsrealstorattr::getStor_id, IOSEnum.STOR_CODE.code("半成品仓库"))
+        );
+
+        JSONObject result = new JSONObject();
+        result.put("data", JSONArray.parseArray(JSON.toJSONString(storList)));
+        result.put("message", "查询成功");
+        return result;
+    }
+
+    @Override
+    @Transactional
+    public JSONObject getMaterialIvt(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public JSONObject create(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getDtlAll(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getPoint() {
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public JSONObject sendTask(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public JSONObject confirm(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public JSONObject confirmOffer(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public JSONObject confirmFinance(JSONObject whereJson) {
+        return null;
+    }
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpInServiceImpl.java

@@ -1,35 +1,21 @@
-package org.nl.wms.storage_manage.semimanage.service.pda.impl;
+package org.nl.wms.storage_manage.pda.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageHelper;
-import org.apache.commons.lang3.StringUtils;
-import org.nl.common.TableDataInfo;
-import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
 import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
 import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
-import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
 import org.nl.wms.storage_manage.IOSEnum;
-import org.nl.wms.storage_manage.semimanage.service.pda.PdaStBcpInService;
+import org.nl.wms.storage_manage.pda.service.PdaStBcpInService;
-import org.nl.wms.storage_manage.semimanage.service.structIvt.IStIvtStructivtBcpService;
-import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp;
-import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.mapper.StIvtStructivtBcpMapper;
-import org.nl.wms.storage_manage.semimanage.service.structIvt.dto.StructIvtBcpQuery;
 import org.nl.wms.system_manage.service.dict.ISysDictService;
 import org.nl.wms.system_manage.service.dict.dao.Dict;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -52,7 +38,7 @@ public class PdaStBcpInServiceImpl implements PdaStBcpInService {
     private ISysDictService iSysDictService; // 字典服务
 
     @Override
-    public JSONObject getBcpIvtInfo() {
+    public JSONObject getBcpStor() {
         List<StIvtBsrealstorattr> storList = storattrService.list(
                 new QueryWrapper<StIvtBsrealstorattr>().lambda()
                         .eq(StIvtBsrealstorattr::getIs_used, IOSEnum.IS_USED.code("是"))
@@ -74,4 +60,37 @@ public class PdaStBcpInServiceImpl implements PdaStBcpInService {
         result.put("message", "查询成功");
         return result;
     }
+
+    @Override
+    public JSONObject getMaterial(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getPoint() {
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public JSONObject callVehicle() {
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public JSONObject createIn(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getAll(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public JSONObject confirm(JSONObject whereJson) {
+        return null;
+    }
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpOutServiceImpl.java

@@ -0,0 +1,90 @@
+package org.nl.wms.storage_manage.pda.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
+import org.nl.wms.storage_manage.IOSEnum;
+import org.nl.wms.storage_manage.pda.service.PdaStBcpOutService;
+import org.nl.wms.system_manage.service.dict.ISysDictService;
+import org.nl.wms.system_manage.service.dict.dao.Dict;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 一体机半成品出库 服务实现类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2023-06-28
+ */
+@Service
+public class PdaStBcpOutServiceImpl implements PdaStBcpOutService {
+
+    @Autowired
+    private IStIvtStructattrService structattrService; // 仓位服务
+
+    @Autowired
+    private IStIvtBsrealstorattrService storattrService; // 实物属性服务
+
+    @Autowired
+    private ISysDictService iSysDictService; // 字典服务
+
+    @Override
+    public JSONObject getBcpStor() {
+        List<StIvtBsrealstorattr> storList = storattrService.list(
+                new QueryWrapper<StIvtBsrealstorattr>().lambda()
+                        .eq(StIvtBsrealstorattr::getIs_used, IOSEnum.IS_USED.code("是"))
+                        .eq(StIvtBsrealstorattr::getStor_id, IOSEnum.STOR_CODE.code("半成品仓库"))
+        );
+
+        JSONObject result = new JSONObject();
+        result.put("data", JSONArray.parseArray(JSON.toJSONString(storList)));
+        result.put("message", "查询成功");
+        return result;
+    }
+
+    @Override
+    public JSONObject getBillType() {
+        List<Dict> dictList = iSysDictService.getDictByName("ST_INV_BCP_IN_TYPE");
+
+        JSONObject result = new JSONObject();
+        result.put("data", JSONArray.parseArray(JSON.toJSONString(dictList)));
+        result.put("message", "查询成功");
+        return result;
+    }
+
+    @Override
+    public JSONObject getMaterial(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getPoint() {
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public JSONObject createIn(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getAll(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public JSONObject confirm(JSONObject whereJson) {
+        return null;
+    }
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpShutServiceImpl.java

@@ -0,0 +1,68 @@
+package org.nl.wms.storage_manage.pda.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
+import org.nl.wms.storage_manage.IOSEnum;
+import org.nl.wms.storage_manage.pda.service.PdaStBcpShutService;
+import org.nl.wms.system_manage.service.dict.ISysDictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 一体机半成品拼盘 服务实现类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2023-06-27
+ */
+@Service
+public class PdaStBcpShutServiceImpl implements PdaStBcpShutService {
+
+    @Autowired
+    private IStIvtStructattrService structattrService; // 仓位服务
+
+    @Autowired
+    private IStIvtBsrealstorattrService storattrService; // 实物属性服务
+
+    @Autowired
+    private ISysDictService iSysDictService; // 字典服务
+
+    @Override
+    public JSONObject getBcpStor() {
+        List<StIvtBsrealstorattr> storList = storattrService.list(
+                new QueryWrapper<StIvtBsrealstorattr>().lambda()
+                        .eq(StIvtBsrealstorattr::getIs_used, IOSEnum.IS_USED.code("是"))
+                        .eq(StIvtBsrealstorattr::getStor_id, IOSEnum.STOR_CODE.code("半成品仓库"))
+        );
+
+        JSONObject result = new JSONObject();
+        result.put("data", JSONArray.parseArray(JSON.toJSONString(storList)));
+        result.put("message", "查询成功");
+        return result;
+    }
+
+    @Override
+    public JSONObject getBillType() {
+        return null;
+    }
+
+    @Override
+    public JSONObject getdtl(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public JSONObject confirm(JSONObject whereJson) {
+        return null;
+    }
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java

@@ -0,0 +1,91 @@
+package org.nl.wms.storage_manage.pda.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
+import org.nl.wms.storage_manage.IOSEnum;
+import org.nl.wms.storage_manage.pda.service.PdaStCpInService;
+import org.nl.wms.system_manage.service.dict.ISysDictService;
+import org.nl.wms.system_manage.service.dict.dao.Dict;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 一体机成品入库 服务实现类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2023-06-27
+ */
+@Service
+public class PdaStCpInServiceImpl implements PdaStCpInService {
+
+    @Autowired
+    private IStIvtStructattrService structattrService; // 仓位服务
+
+    @Autowired
+    private IStIvtBsrealstorattrService storattrService; // 实物属性服务
+
+    @Autowired
+    private ISysDictService iSysDictService; // 字典服务
+
+    @Override
+    public JSONObject getBcpStor() {
+        List<StIvtBsrealstorattr> storList = storattrService.list(
+                new QueryWrapper<StIvtBsrealstorattr>().lambda()
+                        .eq(StIvtBsrealstorattr::getIs_used, IOSEnum.IS_USED.code("是"))
+                        .eq(StIvtBsrealstorattr::getStor_id, IOSEnum.STOR_CODE.code("半成品仓库"))
+        );
+
+        JSONObject result = new JSONObject();
+        result.put("data", JSONArray.parseArray(JSON.toJSONString(storList)));
+        result.put("message", "查询成功");
+        return result;
+    }
+
+    @Override
+    public JSONObject getBillType() {
+        List<Dict> dictList = iSysDictService.getDictByName("ST_INV_BCP_IN_TYPE");
+
+        JSONObject result = new JSONObject();
+        result.put("data", JSONArray.parseArray(JSON.toJSONString(dictList)));
+        result.put("message", "查询成功");
+        return result;
+    }
+
+    @Override
+    public JSONObject getPoint() {
+        return null;
+    }
+
+    @Override
+    public JSONObject getMaterial(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public JSONObject confirmIn(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getAll(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public JSONObject confirm(JSONObject whereJson) {
+        return null;
+    }
+
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/pda/PdaStBcpInController.java

@@ -1,45 +0,0 @@
-package org.nl.wms.storage_manage.semimanage.controller.pda;
-
-
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.ApiOperation;
-import org.nl.common.anno.Log;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.storage_manage.semimanage.service.pda.PdaStBcpInService;
-import org.nl.wms.storage_manage.semimanage.service.structIvt.IStIvtStructivtBcpService;
-import org.nl.wms.storage_manage.semimanage.service.structIvt.dto.StructIvtBcpQuery;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * <p>
- * 一体机半成品入库 前端控制器
- * </p>
- *
- * @author Liuxy
- * @since 2023-06-27
- */
-@RestController
-@RequestMapping("/api/pda/bcp")
-public class PdaStBcpInController {
-
-    @Autowired
-    private PdaStBcpInService pdaStBcpInService;
-
-    @PostMapping("/getBcpStor")
-    @Log("查询半成品仓库")
-    @ApiOperation("查询半成品仓库")
-    public ResponseEntity<Object> getBcpIvtInfo() {
-        return new ResponseEntity<>(pdaStBcpInService.getBcpIvtInfo(), HttpStatus.OK);
-    }
-
-    @PostMapping("/getBillType")
-    @Log("查询单据类型")
-    @ApiOperation("查询单据类型")
-    public ResponseEntity<Object> getBillType() {
-        return new ResponseEntity<>(pdaStBcpInService.getBillType(), HttpStatus.OK);
-    }
-}
-

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/pda/PdaStBcpInService.java

@@ -1,33 +0,0 @@
-package org.nl.wms.storage_manage.semimanage.service.pda;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
-import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp;
-import org.nl.wms.storage_manage.semimanage.service.structIvt.dto.StructIvtBcpQuery;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 一体机半成品入库 服务类
- * </p>
- *
- * @author Liuxy
- * @since 2023-06-27
- */
-public interface PdaStBcpInService {
-
-    /*
-        查询半成品仓库
-     */
-    JSONObject getBcpIvtInfo();
-
-    /*
-     查询单据类型
-    */
-    JSONObject getBillType();
-}