UDI
/
spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fencang' into busUser

Browse Source
zhairh
anthonyywj2 3 years ago
parent c290ff9adf bfdfb6cc13
commit d7dea46975
8 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File

1
api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java
Unescape Escape View File

@ -97,6 +97,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类型

3
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
Unescape Escape View File

@ -405,6 +405,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"));
@ -601,8 +602,6 @@ public class StockOrderController {
}
public String getCustomerId() {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {

4
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java
Unescape Escape View File

@ -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;

3
api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java
Unescape Escape View File

@ -71,4 +71,7 @@ public class BussinessTypeEntity {
private int orderVisibleType; //订单详情展示方式：0：根据批次号展示，1:根据条码展示
private boolean supplementAll;
private boolean checkCopy;
private boolean secCheckCopy;
}

2
api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java
Unescape Escape View File

@ -72,4 +72,6 @@ public class BussinessTypResponse {
private int orderVisibleType; //订单详情展示方式：0：根据批次号展示，1:根据条码展示
private boolean supplementAll; //是否全量补单
private boolean checkCopy;
private boolean secCheckCopy;
}

13
api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
Unescape Escape View File

@ -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);

1
api-admin/src/main/java/com/glxp/sale/admin/util/PermissionRuleTreeUtils.java
Unescape Escape View File

@ -22,6 +22,7 @@ public class PermissionRuleTreeUtils {
for (AuthPermissionRule v : authPermissionRuleList) {
AuthPermissionRuleMergeResponse authPermissionRuleMergeResponse = new AuthPermissionRuleMergeResponse();
BeanUtils.copyProperties(v, authPermissionRuleMergeResponse);
authPermissionRuleMergeResponse.setStatus(Long.valueOf(v.getStatus()));
if (pid.equals(v.getPid())) {
authPermissionRuleMergeResponse.setChildren(merge(authPermissionRuleList, v.getId()));
authPermissionRuleMergeResponseList.add(authPermissionRuleMergeResponse);

18
api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
Unescape Escape View File

@ -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}
)
</insert>
@ -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}
)
</insert>
@ -328,7 +331,8 @@
<if test="defaultSubInv != null">defaultSubInv=#{defaultSubInv},</if>
<if test="defaultInv != null">defaultInv=#{defaultInv},</if>
<if test="orderVisibleType != null">orderVisibleType=#{orderVisibleType},</if>
<if test="checkCopy != null">checkCopy=#{checkCopy},</if>
<if test="secCheckCopy != null">secCheckCopy=#{secCheckCopy},</if>
thirdSysFk=#{thirdSysFk},
</trim>
WHERE id = #{id}

Write Preview
Loading…
Cancel
Save