From d4f7452e7fe9d082be61fcb842b08123ae030f9c Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 8 Nov 2024 17:26:04 +0800 Subject: [PATCH] =?UTF-8?q?wms=E4=BF=AE=E6=94=B93=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OdsProcureOutOrderController.java | 6 + .../controller/WmsToWCSmissionController.java | 17 ++ .../wms/mapper/OdsProcureOutOrderMapper.java | 12 + .../mapper/WmsOdsMateStorageNewsMapper.java | 2 + .../service/IOdsProcureOutOrderService.java | 6 + .../wms/service/IWmsSellOutEmbryoService.java | 3 + .../BpRawMaterialInDetailServiceImpl.java | 16 +- .../impl/OdsProcureOutOrderServiceImpl.java | 154 +++++++++- .../WmsOdsMateStorageNewsServiceImpl.java | 3 +- .../impl/WmsSellOutEmbryoServiceImpl.java | 7 +- .../mapper/wms/OdsProcureOutOrderMapper.xml | 277 ++++++++++++++++++ .../wms/WmsOdsMateStorageNewsMapper.xml | 12 + 12 files changed, 499 insertions(+), 16 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java index 1ea09b221..544febab4 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java @@ -156,4 +156,10 @@ public class OdsProcureOutOrderController extends BaseController { List list = odsProcureOutOrderService.listckTS(odsProcureOutOrder); return getDataTable(list); } + //特殊出库 + @PostMapping("/addOdsProcureOutOrderTS") + public AjaxResult addOdsProcureOutOrderTS( @RequestBody List orderList) { + String result = odsProcureOutOrderService.addOdsProcureOutOrderTS(orderList); + return success(result); + } } 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 c58812647..ff292df3f 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 @@ -2,8 +2,10 @@ package com.op.wms.controller; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.domain.R; import com.op.common.core.utils.StringUtils; +import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.wms.domain.*; @@ -11,6 +13,8 @@ import com.op.wms.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; +import java.util.Date; import java.util.List; import static com.op.common.core.web.domain.AjaxResult.error; @@ -890,4 +894,17 @@ public class WmsToWCSmissionController { wmsSellOutEmbryoService.SynchronizationOfShippingDocuments(); return R.ok(); } + //特殊出库 + @PostMapping("/listOdsProcureOutOrderTS") + public AjaxResult listOdsProcureOutOrderTS(@RequestBody OdsProcureOutOrder order) { + List result = odsProcureOutOrderService.listOdsProcureOutOrderTS(order); + return success(result); + } + @PostMapping("/OdsProcureOutOrderTSCK") + public AjaxResult OdsProcureOutOrderTSCK(@RequestBody OdsProcureOutOrder order) { + String result = odsProcureOutOrderService.OdsProcureOutOrderTSCK(order); + return success(result); + } + + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java index c4feace5e..6e6481980 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java @@ -153,4 +153,16 @@ public interface OdsProcureOutOrderMapper { void updateWMSOdsProcureOutOrdersapById(OdsProcureOutOrder order1); List listckTS(OdsProcureOutOrder odsProcureOutOrder); + + void addOdsProcureOutOrderTS(OdsProcureOutOrder order); + + List listOdsProcureOutOrderTS(OdsProcureOutOrder order); + + String selectOdsProcureOutOrderTS(String formattedDate); + + List selectWmsOdsProcureOutOrderSpecial(OdsProcureOutOrder odsProcureOutOrder1); + + void updateWmsOdsProcureOutOrderSpecial(OdsProcureOutOrder order1); + + List selectWmsOdsProcureOutOrderByOrderStatusSpecial(OdsProcureOutOrder order); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsMapper.java index 6bcbd271f..8ddbc2ac9 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsMapper.java @@ -74,4 +74,6 @@ public interface WmsOdsMateStorageNewsMapper { WmsOdsMateStorageNews selectWmsOdsMateStorageNewsLSByStorageId(String storageId); public List selectWmsOdsMateStorageNewsNEWSList(WmsOdsMateStorageNews wmsOdsMateStorageNews); + + List listWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java index 350190342..e38eca5f1 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java @@ -78,4 +78,10 @@ public interface IOdsProcureOutOrderService { List listReturnDY(OdsProcureOutOrder odsProcureOutOrder); List listckTS(OdsProcureOutOrder odsProcureOutOrder); + + String addOdsProcureOutOrderTS(List orderList); + + List listOdsProcureOutOrderTS(OdsProcureOutOrder order); + + String OdsProcureOutOrderTSCK(OdsProcureOutOrder order); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsSellOutEmbryoService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsSellOutEmbryoService.java index c3121a63a..00a2e8abf 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsSellOutEmbryoService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsSellOutEmbryoService.java @@ -2,6 +2,7 @@ package com.op.wms.service; import java.util.List; +import com.op.wms.domain.OdsProcureOutOrder; import com.op.wms.domain.WmsSellOutEmbryo; /** @@ -82,4 +83,6 @@ public interface IWmsSellOutEmbryoService { List selectWmsSellOutEmbryoREList(WmsSellOutEmbryo wmsSellOutEmbryo); String addRE(List wmsSellOutEmbryoList); + + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpRawMaterialInDetailServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpRawMaterialInDetailServiceImpl.java index 381cfe58f..aafcad71d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpRawMaterialInDetailServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpRawMaterialInDetailServiceImpl.java @@ -23,12 +23,12 @@ import javax.servlet.http.HttpServletRequest; /** * 白坯原材料入库明细Service业务层处理 - * + * * @author ruoyi * @date 2024-10-29 */ @Service -public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailService +public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailService { @Autowired private BpRawMaterialInDetailMapper bpRawMaterialInDetailMapper; @@ -39,7 +39,7 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS /** * 查询白坯原材料入库明细 - * + * * @param id 白坯原材料入库明细主键 * @return 白坯原材料入库明细 */ @@ -52,7 +52,7 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS /** * 查询白坯原材料入库明细列表 - * + * * @param bpRawMaterialInDetail 白坯原材料入库明细 * @return 白坯原材料入库明细 */ @@ -101,7 +101,7 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS bpRawMaterialIn1.setWaCode("白坯原料库"); bpRawMaterialIn1.setMaterialName(bpRawMaterialInDetail.getMaterialName()); BaseProduct baseProduct = baseProductMapper.selectBaseProductByProductName(bpRawMaterialInDetail.getMaterialName()); - bpRawMaterialIn1.setMaterialCode(String.valueOf(baseProduct)); + bpRawMaterialIn1.setMaterialCode(baseProduct.getProductCode()); bpRawMaterialIn1.setUnit(bpRawMaterialInDetail.getUnit()); bpRawMaterialIn1.setAmountReal(bpRawMaterialInDetail.getAmountReal()); reselt=bpRawMaterialInMapper.insertBpRawMaterialIn(bpRawMaterialIn1); @@ -117,7 +117,7 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS /** * 修改白坯原材料入库明细 - * + * * @param bpRawMaterialInDetail 白坯原材料入库明细 * @return 结果 */ @@ -130,7 +130,7 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS /** * 批量删除白坯原材料入库明细 - * + * * @param ids 需要删除的白坯原材料入库明细主键 * @return 结果 */ @@ -158,7 +158,7 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS /** * 删除白坯原材料入库明细信息 - * + * * @param id 白坯原材料入库明细主键 * @return 结果 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java index 22b182444..13f989e83 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java @@ -2,14 +2,19 @@ package com.op.wms.service.impl; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; +import com.op.common.core.domain.R; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; +import com.op.system.api.domain.sap.SapBackflushMPQuery; +import com.op.system.api.domain.sap.SapMaterialPosting; +import com.op.wms.domain.WmsOdsEmStorageNews; +import com.op.wms.domain.WmsOdsMateStorageNews; +import com.op.wms.domain.WmsOdsMateStorageNewsSn; +import com.op.wms.mapper.WmsOdsMateStorageNewsSnMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.OdsProcureOutOrderMapper; @@ -30,6 +35,8 @@ import javax.servlet.http.HttpServletRequest; public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService { @Autowired private OdsProcureOutOrderMapper odsProcureOutOrderMapper; + @Autowired + private WmsOdsMateStorageNewsSnMapper wmsOdsMateStorageNewsSnMapper; /** * 查询包材出库单 @@ -248,4 +255,145 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService List orderList = odsProcureOutOrderMapper.listckTS(odsProcureOutOrder); return orderList; } + + @Override + @DS("#header.poolName") + public String addOdsProcureOutOrderTS(List orderList) { + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String factoryCode = request.getHeader(key.substring(8)).replace("ds_", ""); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); + //TH ods_procure_order_card + Date date = new Date(); + String formattedDate = dateFormat.format(date); + String result= odsProcureOutOrderMapper.selectOdsProcureOutOrderTS(formattedDate); + for (OdsProcureOutOrder order: + orderList) { + order.setID(IdUtils.fastSimpleUUID()); + order.setFactoryCode(factoryCode); + order.setActive("1"); + order.setProduceCode("TS"+result); + order.setCreateDate(new Date()); + order.setUserDefined1(result);//批次 + order.setOutNumber(new BigDecimal("0")); + order.setCreateBy(order.getCreateBy()); + order.setOrderStatus("0");//0,未出库。1部分出库，2全部出库 + odsProcureOutOrderMapper.addOdsProcureOutOrderTS(order); + } + + return null; + } + + + @Override + public List listOdsProcureOutOrderTS(OdsProcureOutOrder procureOutOrder) { + String factoryCode = procureOutOrder.getFactoryCode(); + DynamicDataSourceContextHolder.push("ds_" + factoryCode); + List odsProcureOutOrders= odsProcureOutOrderMapper.listOdsProcureOutOrderTS(procureOutOrder); + return odsProcureOutOrders; + } + + @Override + public String OdsProcureOutOrderTSCK(OdsProcureOutOrder procureOutOrder) { + String result="操作成功"; + List orderList= procureOutOrder.getOrderList();//标识卡 + List gzList= procureOutOrder.getGzList();//订单 +// "mateOrderInSnId": "03b46cff74a444c4a065f8d2beb1e883", +// "materialCode": "000000040000018252",标识卡上的物料编号 +// "materialDesc": "纸筒蚊香塑料盖（2302）",标识卡上的物料描述 +// "sn": "4500360810-00020-0-20241010-1823-1",标识卡号 +// "amount": 操作数量, +// factoryCode工厂号 +// createBy操作人 +// "produceCode": + if(orderList.size()>0){ + String factoryCode = orderList.get(0).getFactoryCode(); + DynamicDataSourceContextHolder.push("ds_" + factoryCode); + for (OdsProcureOutOrder odsProcureOutOrder : + orderList) { + String produceCode= odsProcureOutOrder.getProduceCode();//生产领料单号"订单编号" + String createBy= odsProcureOutOrder.getCreateBy();//操作人 + String mateOrderInSnId= odsProcureOutOrder.getMateOrderInSnId();//标识卡对应id + String sn= odsProcureOutOrder.getSn(); + String materialCode= odsProcureOutOrder.getMaterialCode(); + String materialDesc= odsProcureOutOrder.getMaterialDesc(); + BigDecimal amount= odsProcureOutOrder.getAmount();//数量 + WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn = wmsOdsMateStorageNewsSnMapper.selectWmsOdsMateStorageNewsSnByMateOrderInSnIdk(mateOrderInSnId); + //包材明细表 + OdsProcureOutOrder order = new OdsProcureOutOrder(); + + order.setProduceCode(produceCode);//领料单 + order.setMaterialCode(materialCode);// + order.setMaterialDesc(materialDesc); + order.setUserDefined1(wmsOdsMateStorageNewsSn.getUserDefined2());//批次 + order.setUserDefined2(wmsOdsMateStorageNewsSn.getWhCode()); + order.setUserDefined3(wmsOdsMateStorageNewsSn.getWlCode()); + order.setSn(sn); + order.setPlanNumber(amount); + order.setLocCode(wmsOdsMateStorageNewsSn.getWaCode());//库区 + order.setID(IdUtils.fastSimpleUUID()); + order.setUnit(wmsOdsMateStorageNewsSn.getUserDefined1()); + order.setFactoryCode(factoryCode); + order.setActive("1"); + order.setCreateBy(createBy); + order.setCreateDate(new Date()); + OdsProcureOutOrder odsProcureOutOrder1=new OdsProcureOutOrder(); + odsProcureOutOrder1.setProduceCode(produceCode); + odsProcureOutOrder1.setMaterialCode(materialCode); + List odsProcureOutOrders = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderSpecial(odsProcureOutOrder1); + //包材出库单----会有特殊的那种二次过账的单子--就看前端会不会传对应的标识卡了 + OdsProcureOutOrder order1= odsProcureOutOrders.get(0); + order.setUserDefined4(order1.getUserDefined4()); + //出库明细 + odsProcureOutOrderMapper.insertWmsRawMissionOut(order); + //BigDecimal sapNumber =order1.getSapNumber(); + BigDecimal realityNumber1 = order1.getOutNumber();//累出库数 + BigDecimal realityNumber = order1.getPlanNumber();//计划 + BigDecimal planNumber = amount;//本次实际数量 + BigDecimal tem = realityNumber1.add(planNumber); + if (tem.compareTo(realityNumber)>= 0) { + order1.setOrderStatus("3");//3是满足出库数量 + } else { + order1.setOrderStatus("2"); + } + order1.setOutNumber(tem);//这样的话，就可以用已经过账的数量来计算要过账的数量，用出库数量减去已经过账的数量，就是要过账的数量，只要不为0，就可以进行 + +// order1.setSapNumber(sapNumber.add(planNumber));//原本的过账数量 + odsProcureOutOrderMapper.updateWmsOdsProcureOutOrderSpecial(order1);//订单修改--会超 + wmsOdsMateStorageNewsSn.setOutNumber(amount); + wmsOdsMateStorageNewsSn.setLastModifiedBy(createBy); + //库存明细--包材库存 + wmsOdsMateStorageNewsSnMapper.updateWmsOdsMateStorageNewsSnAddoutNumber(wmsOdsMateStorageNewsSn); + WmsOdsEmStorageNews wmsOdsEmStorageNews = new WmsOdsEmStorageNews(); + wmsOdsEmStorageNews.setWhCode(wmsOdsMateStorageNewsSn.getWhCode());//仓库编码 + wmsOdsEmStorageNews.setWlCode(wmsOdsMateStorageNewsSn.getWlCode());//库位编码 + wmsOdsEmStorageNews.setWaCode(wmsOdsMateStorageNewsSn.getWaCode()); + wmsOdsEmStorageNews.setProductBatch(wmsOdsMateStorageNewsSn.getUserDefined2()); + wmsOdsEmStorageNews.setMaterialCode(wmsOdsMateStorageNewsSn.getMaterialCode()); + wmsOdsEmStorageNews.setAmount(odsProcureOutOrder.getPlanNumber());//库存 + wmsOdsEmStorageNews.setLastModifiedBy(createBy); + wmsOdsMateStorageNewsSnMapper.updatekdd(wmsOdsEmStorageNews);//库存调整 + } + } + OdsProcureOutOrder order=new OdsProcureOutOrder(); + + List orderList1 = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderByOrderStatusSpecial(order); + + + if (orderList1.size()>0){ + OutboundPostingzcSAPGYTS(orderList1); + } + if (gzList.size()>0) { + for (OdsProcureOutOrder order1: + gzList) { + System.out.print("---------"+order1.getID()); + } + OutboundPostingzcSAPGYTS(gzList); + } + return result; + } + public void OutboundPostingzcSAPGYTS(List orderList) { + //过账时要对其进行判断判断其内部订单，和成本中心 + + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsServiceImpl.java index a34ff4c56..012d59e90 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsServiceImpl.java @@ -213,8 +213,9 @@ public class WmsOdsMateStorageNewsServiceImpl implements IWmsOdsMateStorageNewsS } @Override + @DS("#header.poolName") public List listWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews) { - return null; + return wmsOdsMateStorageNewsMapper.listWmsOdsMateStorageNews(wmsOdsMateStorageNews); } public String dayin( List orderList) { diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java index 20e42ca7d..d519cb6b8 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java @@ -13,9 +13,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.uuid.IdUtils; -import com.op.wms.domain.OdsProcureOrder; -import com.op.wms.domain.ShipmentTDO; -import com.op.wms.domain.WmsFpStorageNewsSn; +import com.op.wms.domain.*; import com.op.wms.mapper.WmsFpStorageNewsSnMapper; import okhttp3.*; import org.springframework.beans.factory.annotation.Autowired; @@ -24,7 +22,6 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Service; import com.op.wms.mapper.WmsSellOutEmbryoMapper; -import com.op.wms.domain.WmsSellOutEmbryo; import com.op.wms.service.IWmsSellOutEmbryoService; /** @@ -197,6 +194,8 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService { } + + public List dayin( ) { // 定义请求的URL地址 String url = dayinUrl2; diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index af5b5f935..313dc77aa 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -1596,4 +1596,281 @@ + + insert into wms_ods_procure_out_order_special + + Site_code, + ID, + Produce_Code, + Material_Code, + Material_Desc, + Plan_Date, + Plan_Number, + Unit, + Out_Number, + Loc_Code, + Loc_Desc, + Production_Line_Desc, + Production_Line_Code, + Order_Status, + User_Defined1, + User_Defined2, + User_Defined3, + User_Defined4, + User_Defined5, + User_Defined6, + User_Defined7, + User_Defined8, + User_Defined9, + User_Defined10, + User_Defined11, + Supplier_Code, + Supplier_Name, + Create_By, + Create_Date, + Last_Update_By, + Last_Update_Date, + Active, + Enterprise_Id, + Enterprise_Code, + + + #{siteCode}, + #{ID}, + #{produceCode}, + #{materialCode}, + #{materialDesc}, + #{planDate}, + #{planNumber}, + #{Unit}, + #{outNumber}, + #{locCode}, + #{locDesc}, + #{productionLineDesc}, + #{productionLineCode}, + #{orderStatus}, + #{userDefined1}, + #{userDefined2}, + #{userDefined3}, + #{userDefined4}, + #{userDefined5}, + #{userDefined6}, + #{userDefined7}, + #{userDefined8}, + #{userDefined9}, + #{userDefined10}, + #{userDefined11}, + #{supplierCode}, + #{supplierName}, + #{createBy}, + #{createDate}, + #{lastUpdateBy}, + #{lastUpdateDate}, + #{Active}, + #{enterpriseId}, + #{enterpriseCode}, + + + + + + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml index 725d0ce04..23418ba34 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml @@ -404,4 +404,16 @@ gmt_modified=GETDATE() where wh_code=#{whCode} and wl_code=#{wlCode} and wa_code=#{waCode} and material_code=#{materialCode} +