From fc0f37c183c6e2f289a125e42a2e71562c0b9395 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Mon, 8 Aug 2022 14:07:10 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=89=B9=E6=AC=A1=E5=8F=B7=E5=A4=A7?=
=?UTF-8?q?=E5=B0=8F=E5=86=99=E4=B8=8D=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sale/admin/controller/inout/WareHouseController.java | 7 ++-----
.../glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java | 2 +-
.../sale/admin/service/inout/impl/OrderServiceImpl.java | 5 ++++-
api-admin/src/main/resources/application-dev.properties | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
index 9acafaa..34dc4e0 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
@@ -60,10 +60,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
@RestController
@@ -908,7 +905,7 @@ public class WareHouseController {
if (!StrUtil.emptyIfNull(originUdiEntity.getUdi()).equals(StrUtil.emptyIfNull(udiEntity.getUdi()))) {
continue;
}
- if (!StrUtil.emptyIfNull(originUdiEntity.getBatchNo()).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo()))) {
+ if (!StrUtil.emptyIfNull(originUdiEntity.getBatchNo()).toUpperCase(Locale.ROOT).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo()).toUpperCase(Locale.ROOT))) {
continue;
}
if (!StrUtil.emptyIfNull(originUdiEntity.getProduceDate()).equals(StrUtil.emptyIfNull(udiEntity.getProduceDate()))) {
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java
index 4a53e3c..e3dcb86 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java
@@ -33,5 +33,5 @@ public interface BussinessLocalTypeDao {
*
* @param action
*/
- boolean selectPreInByOrderType(String action);
+ Boolean selectPreInByOrderType(String action);
}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
index af3381d..adde15f 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
@@ -635,7 +635,10 @@ public class OrderServiceImpl implements OrderService {
* @return
*/
private boolean isPreInOrder(OrderEntity orderEntity) {
- return bussinessLocalTypeDao.selectPreInByOrderType(orderEntity.getAction());
+ Boolean isTrue = bussinessLocalTypeDao.selectPreInByOrderType(orderEntity.getAction());
+ if (isTrue == null)
+ return false;
+ return isTrue;
}
}
diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties
index e7a43e4..47695ab 100644
--- a/api-admin/src/main/resources/application-dev.properties
+++ b/api-admin/src/main/resources/application-dev.properties
@@ -1,7 +1,7 @@
# \u751F\u4EA7\u73AF\u5883
server.port=9906
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph2?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=123456
#spring.datasource.password=123456
From 8ae35da5614e02d0d803e7977a552c6b148565d3 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Mon, 8 Aug 2022 15:29:50 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=8D=95?=
=?UTF-8?q?=E6=8D=AE=E5=88=A0=E9=99=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sale/admin/controller/inout/WareHouseController.java | 3 +++
.../sale/admin/dao/inventory/InvPreProductDetailDao.java | 8 ++++++++
.../mapper/inventory/InvPreInProductDetailDao.xml | 8 ++++++++
.../mybatis/mapper/inventory/InvPreProductDetailDao.xml | 9 +++++++++
4 files changed, 28 insertions(+)
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
index 34dc4e0..971298d 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
@@ -581,6 +581,9 @@ public class WareHouseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
AddCodeResult addCodeResult = new AddCodeResult();
+ if (addOrderRequest.getAction() == null) {
+ addOrderRequest.setAction(addOrderRequest.getBillType());
+ }
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getAction());
String code = addOrderRequest.getCode();
if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreProductDetailDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreProductDetailDao.java
index fecf709..0a29d3e 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreProductDetailDao.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreProductDetailDao.java
@@ -26,4 +26,12 @@ public interface InvPreProductDetailDao {
boolean deleteByProductId(FilterInvProductDetailRequest filterInvProductDetailRequest);
int statCount(FilterInvProductDetailRequest filterInvProductDetailRequest);
+
+ /**
+ * 根据orderId删除预验收库存详情
+ *
+ * @param orderIdFk 扫码单据ID
+ */
+ boolean deleteByOrderId(String orderIdFk);
+
}
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml
index 98f0127..b75f91c 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml
@@ -295,4 +295,12 @@
+
+
+
+ delete
+ from inv_product_detail
+ where orderIdFk = #{orderIdFk}
+
+
\ No newline at end of file
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml
index f132688..3f1e378 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml
@@ -232,4 +232,13 @@
+
+
+
+
+ delete
+ from inv_product_detail
+ where orderIdFk = #{orderIdFk}
+
+
\ No newline at end of file
From 8702fee6c888a5e945649bddc83fcde61cb22417 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Mon, 8 Aug 2022 17:39:18 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BA=8C=E7=BA=A7bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/inout/StockOrderController.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
index 88b8450..d1f7d63 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
@@ -43,6 +43,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
@RestController
@@ -158,8 +159,21 @@ public class StockOrderController {
if (!verifyResult) {
return ResultVOUtils.error(500, "实际数量不能高于订单数量");
}
+ List filterList = new ArrayList();
+ for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderPostRequest.getSubErpOrders()) {
+
+ filterList.add(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId()) + StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()));
+
+ }
+ HashSet set = new HashSet<>(filterList);
+ Boolean result = set.size() == filterList.size() ? true : false;
+ if (!result) {
+ return ResultVOUtils.error(500, "存在相同批次产品,提交失败!");
+ }
+
}
+
if (StringUtils.isBlank(stockOrderEntity.getId())) {
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
if (StrUtil.isEmpty(stockOrderPostRequest.getBillNo())) {
From c632b545f3a9b67d7beb7a7b84ccad951b6050e5 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 9 Aug 2022 14:53:06 +0800
Subject: [PATCH 4/6] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9,=E5=8D=95=E6=8D=AE?=
=?UTF-8?q?=E8=A1=A5=E5=8D=95=E6=9C=AA=E6=B7=BB=E5=8A=A0=E4=BB=93=E5=BA=93?=
=?UTF-8?q?=E5=8F=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/controller/basic/BasicThirdSysController.java | 6 ++++++
.../controller/basic/BussinessOriginTypeController.java | 5 +++++
.../sale/admin/controller/inout/UdiTraceController.java | 5 +++++
.../com/glxp/sale/admin/thread/InvProductsTrService.java | 6 ++++--
.../src/main/resources/mybatis/mapper/inout/OrderDao.xml | 8 ++++----
.../mybatis/mapper/inventory/InvPreInProductDetailDao.xml | 2 +-
6 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicThirdSysController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicThirdSysController.java
index 6ceae36..9f884e8 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicThirdSysController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicThirdSysController.java
@@ -110,6 +110,12 @@ public class BasicThirdSysController {
return ResultVOUtils.error(500, "至少需需用一个第三方系统!");
}
}
+
+ if (temp.getMainSys() && !temp.getEnabled()) {
+ return ResultVOUtils.error(500, "主系统必须启用");
+ }
+
+
if (temp.getMainSys() != basicThirdSysEntity.getMainSys()) {
if (udiRelevanceService.isExit() || unitMaintainService.isExit()) {
return ResultVOUtils.error(999, "设置主系统失败");
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java
index 385362b..5457090 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java
@@ -109,6 +109,11 @@ public class BussinessOriginTypeController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (bussinessTypeEntity != null) {
+ BussinessOriginTypeEntity bussinessOriginTypeEntity = bussinessOriginTypeService.findByAction(bussinessTypeEntity.getAction());
+ if (bussinessOriginTypeEntity != null) {
+ return ResultVOUtils.error(500, "单据类型已存在!");
+ }
+
bussinessOriginTypeService.insertBusOriginType(bussinessTypeEntity);
} else {
return ResultVOUtils.error(999, "参数错误");
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/UdiTraceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/UdiTraceController.java
index 2aa9a1c..9e411db 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/UdiTraceController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/UdiTraceController.java
@@ -105,6 +105,11 @@ public class UdiTraceController {
udiTraceResponse.setCpmctymc(finalUdiRelevance.getCpmctymc());
udiTraceResponse.setGgxh(finalUdiRelevance.getGgxh());
udiTraceResponse.setOrderId(item.getId());
+ InvProductDetailEntity invProductDetailEntity = invProductDetailEntities.get(0);
+ udiTraceResponse.setBatchNo(invProductDetailEntity.getBatchNo());
+ udiTraceResponse.setProduceDate(invProductDetailEntity.getProductionDate());
+ udiTraceResponse.setExpireDate(invProductDetailEntity.getExpireDate());
+ udiTraceResponse.setCount(invProductDetailEntity.getCount());
}
return udiTraceResponse;
}).collect(Collectors.toList());
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java
index ad7cbb3..ecbf30b 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java
@@ -598,6 +598,7 @@ public class InvProductsTrService {
outOrder.setFromCorp(basicUnitMaintainEntity.getName());
outOrder.setFromCorpId(corpName);
outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
+ outOrder.setInvStorageCode(orderEntity.getInvStorageCode());
outOrder.setCorpOrderId(CustomUtil.getId() + "x");
//互填单号
orderEntity.setUllageSupNo(outOrder.getId());
@@ -644,7 +645,7 @@ public class InvProductsTrService {
outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID);
outOrder.setFromCorpId(null);
outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
-
+ outOrder.setInvStorageCode(orderEntity.getInvStorageCode());
//互填单号
orderEntity.setUllageSupNo(outOrder.getId());
orderEntity.setUpdateTime(new Date());
@@ -720,7 +721,7 @@ public class InvProductsTrService {
outOrder.setCorpOrderId(CustomUtil.getId() + "x");
outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
-
+ outOrder.setInvStorageCode(orderEntity.getLocStorageCode());
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit");
if ("1".equals(systemParamConfigEntity.getParamValue())) {
@@ -800,6 +801,7 @@ public class InvProductsTrService {
outOrder.setFromCorpId(temps.get(0).getFromCorpId());
outOrder.setCorpOrderId(CustomUtil.getId() + "x");
outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
+ outOrder.setInvStorageCode(orderEntity.getInvStorageCode());
outOrder.setErpFk(null);
outOrder.setFromType(ConstantStatus.FROM_CHANGE);
outOrder.setReceiveStatus(0);
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
index 29c3ae9..0e0366c 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
@@ -34,7 +34,7 @@
receiveStatus, erpFk, stockCheckFk, customerId, supId,
exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
- fromSubInvCode, createTime)
+ fromSubInvCode, createTime,invStorageCode)
values (#{id},
#{action},
#{corpOrderId},
@@ -54,7 +54,7 @@
#{stockCheckFk},
#{customerId}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
#{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},
- #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime})
+ #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime},#{invStorageCode})
@@ -65,7 +65,7 @@
fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
receiveStatus, erpFk, stockCheckFk, customerId, supId,
exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
- outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime)
+ outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,invStorageCode)
values (
#{id},
#{action},
@@ -99,7 +99,7 @@
#{replicateNo},
#{invWarehouseCode},
#{fromSubInvCode},
- #{createTime}
+ #{createTime},#{invStorageCode}
)
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml
index b75f91c..fe62a3c 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml
@@ -299,7 +299,7 @@
delete
- from inv_product_detail
+ from inv_prein_product_detail
where orderIdFk = #{orderIdFk}
From 74b9f98ee422d41316b4707b768f4ca512539ff0 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 9 Aug 2022 18:55:53 +0800
Subject: [PATCH 5/6] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/inout/OrderController.java | 6 ++++
.../controller/inout/WareHouseController.java | 34 +++++++++++++------
.../service/inout/impl/OrderServiceImpl.java | 5 ++-
3 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
index 596078a..a92d5bd 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
@@ -34,6 +34,7 @@ import com.glxp.sale.admin.service.inout.*;
import com.glxp.sale.admin.service.inventory.InvWarehouseService;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.thread.InvProductsTrService;
+import com.glxp.sale.admin.thread.IoTransInoutService;
import com.glxp.sale.admin.util.*;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
@@ -92,6 +93,8 @@ public class OrderController {
CodesTempDao codesTempDao;
@Resource
private AuthAdminService authAdminService;
+ @Resource
+ IoTransInoutService ioTransInoutService;
@AuthRuleAnnotation("")
@GetMapping("udiwms/inout/order/getUdi")
@@ -634,6 +637,9 @@ public class OrderController {
mainOrderEntity.setErpFk(docidStr);
mainOrderEntity.setUpdateTime(new Date());
orderService.updateOrder(mainOrderEntity);
+ if (orderMergeRequest.getType() == 1) {
+ ioTransInoutService.transStatus(mainOrderEntity.getId());
+ }
// ioTransInoutService.transStatus(mainOrderEntity.getId());
} else {
return ResultVOUtils.error(ResultEnum.DATA_ERROR);
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
index 971298d..420be0f 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
@@ -96,7 +96,6 @@ public class WareHouseController {
CompanyProductRelevanceService companyProductRelevanceService;
@Resource
SystemParamConfigService systemParamConfigService;
- Logger logger = LoggerFactory.getLogger(StockOrderController.class);
@Resource
StockOrderService stockOrderService;
@Resource
@@ -279,11 +278,6 @@ public class WareHouseController {
@AuthRuleAnnotation("")
@GetMapping("warehouse/inout/submitOrderWeb")
public BaseResponse submitOrderWeb(AddOrderRequest orderEntity) {
-// if (null != orderEntity) {
-// if (StrUtil.isBlank(orderEntity.getInvWarehouseCode())) {
-// return ResultVOUtils.error(500, "分仓未选择");
-// }
-// }
orderService.updateOrderStatus(orderEntity.getOrderId(), ConstantStatus.ORDER_STATUS_PROCESS);
return saveOrderWeb(orderEntity);
}
@@ -318,6 +312,30 @@ public class WareHouseController {
@AuthRuleAnnotation("")
@PostMapping("warehouse/inout/saveTempCode")
public BaseResponse saveCode(@RequestBody WarehouseEntity warehouseEntity) {
+
+ if (StrUtil.isNotEmpty(warehouseEntity.getSerialNo()) && warehouseEntity.getSerialNo().length() > 20) {
+ return ResultVOUtils.error(500, "无效条码!序列号超出最大范围");
+ }
+
+ if (StrUtil.isNotEmpty(warehouseEntity.getBatchNo()) && warehouseEntity.getBatchNo().length() > 20) {
+ return ResultVOUtils.error(500, "无效条码!批次号超出最大范围");
+ }
+
+ if (StrUtil.isEmpty(warehouseEntity.getSerialNo()) && StrUtil.isEmpty(warehouseEntity.getBatchNo())) {
+ return ResultVOUtils.error(500, "批次号不能为空!");
+ }
+
+
+ if (StrUtil.isNotEmpty(warehouseEntity.getSerialNo())) {
+ List warehouseEntityList = codesTempService.findByOrderId(warehouseEntity.getOrderId());
+ for (WarehouseEntity object : warehouseEntityList) {
+ if (object.getId() != warehouseEntity.getId() && object.getCode().equals(warehouseEntity.getCode()) && StrUtil.nullToEmpty(object.getCode()).equals(warehouseEntity.getSerialNo())) {
+ return ResultVOUtils.error(500, "条码重复!");
+ }
+ }
+ }
+
+
boolean b = codesTempService.update(warehouseEntity);
if (b)
return ResultVOUtils.success("修改成功");
@@ -370,11 +388,7 @@ public class WareHouseController {
}
}
}
-
return ResultVOUtils.success();
-
-//
-
}
@Resource
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
index adde15f..16b9dbd 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
@@ -284,8 +284,6 @@ public class OrderServiceImpl implements OrderService {
supplementOrder.setMainAction(supplementType.getMainAction());
supplementOrder.setAction(supplementType.getAction());
supplementOrder.setErpFk(null);
-// String time = DateUtil.getBeforeMinute(supplementOrder.getActDate(), 5);
-// supplementOrder.setActDate(time);
//复制码表
List codes = codesDao.findByReceiptId(order.getId());
@@ -330,7 +328,8 @@ public class OrderServiceImpl implements OrderService {
stockOrderEntityList.forEach(stockOrderEntity -> {
StockOrderResponse response = new StockOrderResponse();
BeanUtil.copyProperties(stockOrderEntity, response);
- if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER) && checkBusTypeSupplementOrder(stockOrderEntity.getBillNo())) {
+ if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER) && checkBusTypeSupplementOrder(stockOrderEntity.getBillNo())
+ && StrUtil.isEmpty(stockOrderEntity.getSupplementNo())) {
response.setEnableSupplementOrder(true);
}
result.add(response);
From 192faa5e789051377828d47bef56c16e444a6b3b Mon Sep 17 00:00:00 2001
From: x_z
Date: Wed, 10 Aug 2022 20:32:08 +0800
Subject: [PATCH 6/6] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=202.?=
=?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E6=9B=B4=E6=96=B0=E5=8F=91=E7=A5=A8=E5=8F=B7=E7=AD=89?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../inout/OrderDetailController.java | 2 ++
.../inout/StockOrderDetailController.java | 2 +-
.../sale/admin/entity/info/CompanyEntity.java | 5 +++++
.../inout/StockOrderDetailService.java | 7 +++++++
.../impl/StockOrderDetailServiceImpl.java | 19 +++++++++++++++++++
5 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java
index 3b857ad..9e4ece3 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java
@@ -360,6 +360,8 @@ public class OrderDetailController {
filterErpOrderRequest.setLimit(null);
List erpOrderEntities = orderDetailService.filterMyErpOrder(filterErpOrderRequest);
+
+
OrderEntity orderEntity = orderService.findById(filterErpOrderRequest.getOrderId());
if (orderEntity == null) {
return ResultVOUtils.error(500, "单据不存在!");
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
index 2668851..d40e33d 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
@@ -628,7 +628,7 @@ public class StockOrderDetailController {
@PostMapping("/udiwms/stock/order/detail/update")
public BaseResponse updateStockOrderDetail(@RequestBody StockOrderDetailEntity stockOrderDetailEntity) {
if (null != stockOrderDetailEntity)
- stockOrderDetailService.updateById(stockOrderDetailEntity);
+ stockOrderDetailService.updateOrderDetailInfo(stockOrderDetailEntity);
return ResultVOUtils.success("更新成功");
}
}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java
index fd312ff..6f90a44 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java
@@ -1,5 +1,6 @@
package com.glxp.sale.admin.entity.info;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@@ -36,9 +37,13 @@ public class CompanyEntity {
private String registerStatus;
private String jyxkzh;
private String jyxkzfzjg;
+
+ @JsonFormat(shape =JsonFormat.Shape.STRING,pattern ="yyyy-MM-dd")
private Date jyxkzyxq;
private String jybapzh;
private String jybabm;
+
+ @JsonFormat(shape =JsonFormat.Shape.STRING,pattern ="yyyy-MM-dd")
private Date fzrq;
private String suihao;
private String kaihuhang;
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java
index e129f27..19c502d 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java
@@ -35,4 +35,11 @@ public interface StockOrderDetailService {
* @return
*/
boolean verifyCount(List subErpOrders);
+
+ /**
+ * 更新业务单据详情信息
+ *
+ * @param stockOrderDetailEntity
+ */
+ void updateOrderDetailInfo(StockOrderDetailEntity stockOrderDetailEntity);
}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderDetailServiceImpl.java
index 7550b63..4efdeee 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderDetailServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderDetailServiceImpl.java
@@ -108,4 +108,23 @@ public class StockOrderDetailServiceImpl implements StockOrderDetailService {
return true;
}
+ @Override
+ public void updateOrderDetailInfo(StockOrderDetailEntity stockOrderDetailEntity) {
+ if (null != stockOrderDetailEntity) {
+ if (StrUtil.isBlank(stockOrderDetailEntity.getInvoiceDate())) {
+ stockOrderDetailEntity.setInvoiceDate("");
+ }
+ if (StrUtil.isBlank(stockOrderDetailEntity.getFirstSalesInvNo())) {
+ stockOrderDetailEntity.setFirstSalesInvNo("");
+ }
+ if (StrUtil.isBlank(stockOrderDetailEntity.getSecSalesInvNo())) {
+ stockOrderDetailEntity.setSecSalesInvNo("");
+ }
+ if (StrUtil.isBlank(stockOrderDetailEntity.getSecSalesListNo())) {
+ stockOrderDetailEntity.setSecSalesListNo("");
+ }
+ stockOrderDetailDao.updateById(stockOrderDetailEntity);
+ }
+ }
+
}