diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index 171f75f9..d1e43ca4 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -273,7 +273,7 @@ public class WmsToWCSmissionController { public AjaxResult SweepMaterialCardSC(@RequestBody WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn) { WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn1 = odsProcureOrderService.SweepMaterialCardSC(wmsOdsMateStorageNewsSn); if(wmsOdsMateStorageNewsSn1==null){ - return error("库存没有这个标识卡"); + return error("仓库没有这个标识卡"); } if (wmsOdsMateStorageNewsSn1.getUserDefined3().equals("0")){//userDefined3 return error("未105过账"); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml index 3ea4e690..7e605d64 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml @@ -45,6 +45,8 @@ + + @@ -865,6 +867,7 @@ ods_procure_order_card.Active, ods_procure_order_card.Enterprise_Id, ods_procure_order_card.Enterprise_Code, + ods_procure_order_card.tem_number, ods_procure_order.user_defined5 User_Defined5, COALESCE ( ods_procure_order_card.Operation_Number, 0 ) Operation_Number FROM