().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;
+ }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/pda/impl/PdaStBcpInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpInServiceImpl.java
similarity index 67%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/pda/impl/PdaStBcpInServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpInServiceImpl.java
index 8ba181e8..cb920974 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/pda/impl/PdaStBcpInServiceImpl.java
+++ b/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.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.storage_manage.pda.service.PdaStBcpInService;
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;
/**
*
@@ -52,7 +38,7 @@ public class PdaStBcpInServiceImpl implements PdaStBcpInService {
private ISysDictService iSysDictService; // 字典服务
@Override
- public JSONObject getBcpIvtInfo() {
+ public JSONObject getBcpStor() {
List storList = storattrService.list(
new QueryWrapper().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;
+ }
}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpOutServiceImpl.java
new file mode 100644
index 00000000..04b210ed
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 一体机半成品出库 服务实现类
+ *
+ *
+ * @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 storList = storattrService.list(
+ new QueryWrapper().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 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;
+ }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpShutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpShutServiceImpl.java
new file mode 100644
index 00000000..6650ca45
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 一体机半成品拼盘 服务实现类
+ *
+ *
+ * @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 storList = storattrService.list(
+ new QueryWrapper().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;
+ }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java
new file mode 100644
index 00000000..e40e17f8
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 一体机成品入库 服务实现类
+ *
+ *
+ * @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 storList = storattrService.list(
+ new QueryWrapper().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 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;
+ }
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/pda/PdaStBcpInController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/pda/PdaStBcpInController.java
deleted file mode 100644
index 87fe74f2..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/pda/PdaStBcpInController.java
+++ /dev/null
@@ -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.*;
-
-/**
- *
- * 一体机半成品入库 前端控制器
- *
- *
- * @author Liuxy
- * @since 2023-06-27
- */
-@RestController
-@RequestMapping("/api/pda/bcp")
-public class PdaStBcpInController {
-
- @Autowired
- private PdaStBcpInService pdaStBcpInService;
-
- @PostMapping("/getBcpStor")
- @Log("查询半成品仓库")
- @ApiOperation("查询半成品仓库")
- public ResponseEntity