diff --git a/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java
index e0418de..544f5f9 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java
@@ -96,6 +96,7 @@ public class ConstantStatus {
public static final int FROM_UDISP = 7; //udi供应商平台
public static final int FROM_PEACE_CHANGE = 8; //平衡补单
public static final int FROM_UDIWMS = 9;
+ public static final int FROM_COPY = 10; //单据复制
//DI类型
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 16f8442..18a155d 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
@@ -402,6 +402,7 @@ public class StockOrderController {
originOrder.setReceiveStatus(0); //设置验收状态为未验收
originOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
originOrder.setErpFk(null);//关联业务单据置空
+ originOrder.setFromType(ConstantStatus.FROM_COPY);
originOrder.setLocStorageCode(addStockOrderChangeRequest.getLocStorageCode());
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(originOrder.getAction());
String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));
@@ -598,8 +599,6 @@ public class StockOrderController {
}
-
-
public String getCustomerId() {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java
index 06810af..09acdbf 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java
@@ -196,6 +196,10 @@ public class CheckOrderUtils {
if (bussinessTypeEntity.isSecCheckUdiwms()) {
return ConstantStatus.SORDER_CHECKED;
}
+ } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) {
+ if (bussinessTypeEntity.isSecCheckCopy()) {
+ return ConstantStatus.SORDER_CHECKED;
+ }
}
} else {
return ConstantStatus.SORDER_DELIVER;
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java
index 5778244..54abf07 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java
@@ -71,4 +71,7 @@ public class BussinessTypeEntity {
private int orderVisibleType; //订单详情展示方式:0:根据批次号展示,1:根据条码展示
private boolean supplementAll;
+
+ private boolean checkCopy;
+ private boolean secCheckCopy;
}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java
index aa7d689..3217bcd 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java
@@ -72,4 +72,6 @@ public class BussinessTypResponse {
private int orderVisibleType; //订单详情展示方式:0:根据批次号展示,1:根据条码展示
private boolean supplementAll; //是否全量补单
+ private boolean checkCopy;
+ private boolean secCheckCopy;
}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
index 1c91d87..01e0381 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
@@ -665,6 +665,11 @@ public class IoTransInoutService {
unCheckFinish(orderEntity, warehouseEntityList);
return;
}
+ } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) {
+ if (!bussinessTypeEntity.isCheckCopy()) {
+ unCheckFinish(orderEntity, warehouseEntityList);
+ return;
+ }
}
genOrderDetail(warehouseEntityList);
// checkMutiDi(orderEntity.getId(), bussinessTypeEntity); //校验一个DI是否绑定多个产品ID
@@ -980,6 +985,14 @@ public class IoTransInoutService {
if (bussinessTypeEntity.isSecCheckChange()) {
stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
}
+ } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_PEACE_CHANGE) {
+ if (bussinessTypeEntity.isSecCheckBalacne()) {
+ stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
+ }
+ } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) {
+ if (bussinessTypeEntity.isSecCheckCopy()) {
+ stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
+ }
}
} else {
stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER);
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
index 1da2028..9279ca6 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
@@ -19,7 +19,8 @@
basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,
basic_bussiness_type.secCheckBalacne, defaultUnit,basic_bustype_origin.action
thirdAction,basic_bustype_origin.thirdSys,basic_bussiness_type.useDyCount,basic_bussiness_type.expireTip,basic_bussiness_type.prefix,basic_bustype_local.prefix
- localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv,orderVisibleType,supplementAll
+ localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv,orderVisibleType,supplementAll,
+ checkCopy,secCheckCopy
FROM basic_bussiness_type LEFT JOIN basic_bustype_local
on basic_bussiness_type.localAction = basic_bustype_local.action
left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
@@ -134,7 +135,8 @@
basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,defaultUnit,
basic_bussiness_type.secCheckBalacne,basic_bustype_origin.action
thirdAction,basic_bustype_origin.thirdSys,useDyCount,basic_bussiness_type.expireTip,basic_bussiness_type.prefix,basic_bustype_local.prefix
- localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv,orderVisibleType,supplementAll
+ localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv,orderVisibleType,supplementAll,
+ checkCopy,secCheckCopy
FROM basic_bussiness_type LEFT JOIN basic_bustype_local
on basic_bussiness_type.localAction = basic_bustype_local.action
left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
@@ -188,7 +190,7 @@
,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
secCheckChange,corpType,basic_bussiness_type.storageCode,checkBalacne,
secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix
- ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,defaultInv,orderVisibleType)
+ ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,defaultInv,orderVisibleType, checkCopy,secCheckCopy)
values
(
#{action},
@@ -226,7 +228,8 @@
#{prefix},
#{ullageFill},
#{scanPreIn},
- #{vailInv},#{codeFillCheck},#{defaultSubInv},#{defaultInv},#{orderVisibleType}
+ #{vailInv},#{codeFillCheck},#{defaultSubInv},#{defaultInv},#{orderVisibleType},
+ #{checkCopy},#{secCheckCopy}
)
@@ -241,7 +244,7 @@
checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix
- ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,defaultInv,orderVisibleType)
+ ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,defaultInv,orderVisibleType, checkCopy,secCheckCopy)
values
(
#{index},
@@ -280,7 +283,7 @@
#{prefix},
#{ullageFill},
#{scanPreIn},
- #{vailInv},#{codeFillCheck},#{defaultSubInv},#{defaultInv},#{orderVisibleType}
+ #{vailInv},#{codeFillCheck},#{defaultSubInv},#{defaultInv},#{orderVisibleType}, #{checkCopy},#{secCheckCopy}
)
@@ -328,7 +331,8 @@
defaultSubInv=#{defaultSubInv},
defaultInv=#{defaultInv},
orderVisibleType=#{orderVisibleType},
-
+ checkCopy=#{checkCopy},
+ secCheckCopy=#{secCheckCopy},
thirdSysFk=#{thirdSysFk},
WHERE id = #{id}