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

bug修复

Browse Source
fengcang
anthonyywj2 3 years ago
parent bac0685a12
commit 6cd427bed7
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

10
api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
Unescape Escape View File

@ -268,11 +268,11 @@ 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, "分仓未选择");
}
}
// if (null != orderEntity) {
// if (StrUtil.isBlank(orderEntity.getInvWarehouseCode())) {
// return ResultVOUtils.error(500, "分仓未选择");
// }
// }
orderService.updateOrderStatus(orderEntity.getOrderId(), ConstantStatus.ORDER_STATUS_PROCESS);
return saveOrderWeb(orderEntity);
}

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

@ -124,16 +124,19 @@
basic_bussiness_type.id,basic_bussiness_type.action,basic_bussiness_type.name,
basic_bussiness_type.enable,basic_bussiness_type.remark,basic_bussiness_type.mainAction,
basic_bussiness_type.thirdSysFk,basic_bussiness_type.localAction,basic_bussiness_type.secCheckEnable,
basic_bussiness_type.checkUdims,basic_bussiness_type.checkPdaEd,basic_bussiness_type.checkPdaUn,basic_bussiness_type.checkPc,
basic_bussiness_type.checkWebNew,basic_bussiness_type.checkChange,basic_bussiness_type.entrutSpms,basic_bussiness_type.codeFillCheck,
basic_bussiness_type.checkUdims,basic_bussiness_type.checkPdaEd,basic_bussiness_type.checkPdaUn,
basic_bussiness_type.checkPc,
basic_bussiness_type.checkWebNew,basic_bussiness_type.checkChange,basic_bussiness_type.entrutSpms,
basic_bussiness_type.codeFillCheck,
basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaUn,
basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange,,basic_bussiness_type.outTospms,
basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange,basic_bussiness_type.outTospms,
basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv,
basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType,
basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder,
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
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
FROM basic_bussiness_type LEFT JOIN basic_bustype_local
on basic_bussiness_type.localAction = basic_bustype_local.action

3
api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
Unescape Escape View File

@ -94,9 +94,6 @@
<if test="invWarehouseCode != '' and invWarehouseCode != null">
AND invWarehouseCode = #{invWarehouseCode}
</if>
<if test="invWarehouseCode == null">
AND invWarehouseCode is NULL
</if>
</where>
</select>

Write Preview
Loading…
Cancel
Save