From 2a094ca7f551eb1a934616ce79903d8bed709763 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 14 Aug 2023 14:46:50 +0800 Subject: [PATCH] =?UTF-8?q?wms=E6=9C=8D=E5=8A=A1=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PowderChargeOrderController.java | 24 ++- .../com/op/wms/domain/PowderChargeOrder.java | 10 ++ .../wms/mapper/PowderChargeOrderMapper.java | 20 ++- .../mapper/PowderChargeOrderRecordMapper.java | 18 +++ .../wms/service/impl/BaseAreaServiceImpl.java | 14 +- .../service/impl/BaseLocationServiceImpl.java | 14 +- .../impl/BasePowderOrderServiceImpl.java | 11 +- .../service/impl/BaseShiftsTServiceImpl.java | 14 +- .../service/impl/BaseTeamTServiceImpl.java | 14 +- .../impl/BaseWarehouseServiceImpl.java | 14 +- .../impl/OdsInventoryOrderServiceImpl.java | 22 ++- .../impl/OdsProcureOrderServiceImpl.java | 22 ++- .../impl/OdsProcureOutOrderServiceImpl.java | 22 ++- .../OdsWhiteEmbryoInventoryServiceImpl.java | 22 ++- .../impl/OdsWhiteEmbryoServiceImpl.java | 22 ++- .../impl/PowderChargeOrderServiceImpl.java | 136 +++++++++++++++- .../service/impl/SysFactoryServiceImpl.java | 14 +- .../mapper/wms/PowderChargeOrderMapper.xml | 28 +++- .../wms/PowderChargeOrderRecordMapper.xml | 150 ++++++++++++++++++ 19 files changed, 486 insertions(+), 105 deletions(-) create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/mapper/PowderChargeOrderRecordMapper.java create mode 100644 op-modules/op-wms/src/main/resources/mapper/wms/PowderChargeOrderRecordMapper.xml diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/PowderChargeOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/PowderChargeOrderController.java index a1cb3697..5bc0db2c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/PowderChargeOrderController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/PowderChargeOrderController.java @@ -23,7 +23,7 @@ import com.op.common.core.web.page.TableDataInfo; /** * 粉料配料Controller - * + * * @author Open Platform * @date 2023-07-10 */ @@ -68,11 +68,9 @@ public class PowderChargeOrderController extends BaseController { /** * 新增粉料配料 */ - @RequiresPermissions("wms:chargeorder:add") - @Log(title = "粉料配料", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody PowderChargeOrder powderChargeOrder) { - return toAjax(powderChargeOrderService.insertPowderChargeOrder(powderChargeOrder)); + @PostMapping("/add") + public AjaxResult add(@RequestBody List powderChargeOrders) { + return toAjax(powderChargeOrderService.insertPowderChargeOrderAdd(powderChargeOrders)); } /** @@ -94,4 +92,18 @@ public class PowderChargeOrderController extends BaseController { public AjaxResult remove(@PathVariable String[] IDs) { return toAjax(powderChargeOrderService.deletePowderChargeOrderByIDs(IDs)); } + @PostMapping("/SCgetInfo") + public AjaxResult SCgetInfo(String orderCode) { + return success(powderChargeOrderService.selectPowderChargeOrderByOrderCode(orderCode)); + } + //出库 + @PostMapping("/SCoutInfo") + public AjaxResult SCoutInfo(PowderChargeOrder powderChargeOrder) { + return success(powderChargeOrderService.scOutPowderChargeOrder(powderChargeOrder)); + } + //出库记录 + @PostMapping("/getSCoutInfoRecord") + public AjaxResult getSCoutInfoRecord(PowderChargeOrder powderChargeOrder) { + return success(powderChargeOrderService.getSCoutInfoRecord(powderChargeOrder)); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/PowderChargeOrder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/PowderChargeOrder.java index ff934cb5..75006feb 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/PowderChargeOrder.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/PowderChargeOrder.java @@ -48,6 +48,16 @@ public class PowderChargeOrder extends BaseEntity { /** 单位 */ @Excel(name = "单位") private String Unit; + @Excel(name = "库位") + private String wlCode; + + public String getWlCode() { + return wlCode; + } + + public void setWlCode(String wlCode) { + this.wlCode = wlCode; + } /** 实际数量 */ @Excel(name = "实际数量") diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/PowderChargeOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/PowderChargeOrderMapper.java index 64300abc..e9f0307d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/PowderChargeOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/PowderChargeOrderMapper.java @@ -6,14 +6,14 @@ import com.op.wms.domain.PowderChargeOrder; /** * 粉料配料Mapper接口 - * + * * @author Open Platform * @date 2023-07-10 */ public interface PowderChargeOrderMapper { /** * 查询粉料配料 - * + * * @param ID 粉料配料主键 * @return 粉料配料 */ @@ -21,7 +21,7 @@ public interface PowderChargeOrderMapper { /** * 查询粉料配料列表 - * + * * @param powderChargeOrder 粉料配料 * @return 粉料配料集合 */ @@ -29,7 +29,7 @@ public interface PowderChargeOrderMapper { /** * 新增粉料配料 - * + * * @param powderChargeOrder 粉料配料 * @return 结果 */ @@ -37,7 +37,7 @@ public interface PowderChargeOrderMapper { /** * 修改粉料配料 - * + * * @param powderChargeOrder 粉料配料 * @return 结果 */ @@ -45,7 +45,7 @@ public interface PowderChargeOrderMapper { /** * 删除粉料配料 - * + * * @param ID 粉料配料主键 * @return 结果 */ @@ -53,9 +53,15 @@ public interface PowderChargeOrderMapper { /** * 批量删除粉料配料 - * + * * @param IDs 需要删除的数据主键集合 * @return 结果 */ public int deletePowderChargeOrderByIDs(String[] IDs); + + public PowderChargeOrder selectPowderChargeOrderByOrderCode(String orderCode); + + void updatePowderChargeOrderTon(PowderChargeOrder powderChargeOrder); + + void updateOdsRawStorageNews(PowderChargeOrder powderChargeOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/PowderChargeOrderRecordMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/PowderChargeOrderRecordMapper.java new file mode 100644 index 00000000..f84a6252 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/PowderChargeOrderRecordMapper.java @@ -0,0 +1,18 @@ +package com.op.wms.mapper; + +import com.op.wms.domain.PowderChargeOrder; + +import java.util.List; + +/** + * 粉料配料Mapper接口 + * + * @author Open Platform + * @date 2023-07-10 + */ +public interface PowderChargeOrderRecordMapper { + + Integer insertPowderChargeOrderRecord(PowderChargeOrder powderChargeOrder); + + List selectPowderChargeOrderRecordList(PowderChargeOrder powderChargeOrder); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseAreaServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseAreaServiceImpl.java index f571db6d..97604523 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseAreaServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseAreaServiceImpl.java @@ -13,7 +13,7 @@ import com.op.wms.service.IBaseAreaService; /** * 库区Service业务层处理 - * + * * @author Open Platform * @date 2023-07-04 */ @@ -24,7 +24,7 @@ public class BaseAreaServiceImpl implements IBaseAreaService { /** * 查询库区 - * + * * @param areaId 库区主键 * @return 库区 */ @@ -36,7 +36,7 @@ public class BaseAreaServiceImpl implements IBaseAreaService { /** * 查询库区列表 - * + * * @param baseArea 库区 * @return 库区 */ @@ -48,7 +48,7 @@ public class BaseAreaServiceImpl implements IBaseAreaService { /** * 新增库区 - * + * * @param baseArea 库区 * @return 结果 */ @@ -65,7 +65,7 @@ public class BaseAreaServiceImpl implements IBaseAreaService { /** * 修改库区 - * + * * @param baseArea 库区 * @return 结果 */ @@ -79,7 +79,7 @@ public class BaseAreaServiceImpl implements IBaseAreaService { /** * 批量删除库区 - * + * * @param areaIds 需要删除的库区主键 * @return 结果 */ @@ -91,7 +91,7 @@ public class BaseAreaServiceImpl implements IBaseAreaService { /** * 删除库区信息 - * + * * @param areaId 库区主键 * @return 结果 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseLocationServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseLocationServiceImpl.java index fbbd1791..467c6812 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseLocationServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseLocationServiceImpl.java @@ -13,7 +13,7 @@ import com.op.wms.service.IBaseLocationService; /** * 货位管理Service业务层处理 - * + * * @author Open Platform * @date 2023-07-06 */ @@ -24,7 +24,7 @@ public class BaseLocationServiceImpl implements IBaseLocationService { /** * 查询货位管理 - * + * * @param locationId 货位管理主键 * @return 货位管理 */ @@ -36,7 +36,7 @@ public class BaseLocationServiceImpl implements IBaseLocationService { /** * 查询货位管理列表 - * + * * @param baseLocation 货位管理 * @return 货位管理 */ @@ -48,7 +48,7 @@ public class BaseLocationServiceImpl implements IBaseLocationService { /** * 新增货位管理 - * + * * @param baseLocation 货位管理 * @return 结果 */ @@ -62,7 +62,7 @@ public class BaseLocationServiceImpl implements IBaseLocationService { /** * 修改货位管理 - * + * * @param baseLocation 货位管理 * @return 结果 */ @@ -76,7 +76,7 @@ public class BaseLocationServiceImpl implements IBaseLocationService { /** * 批量删除货位管理 - * + * * @param locationIds 需要删除的货位管理主键 * @return 结果 */ @@ -88,7 +88,7 @@ public class BaseLocationServiceImpl implements IBaseLocationService { /** * 删除货位管理信息 - * + * * @param locationId 货位管理主键 * @return 结果 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BasePowderOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BasePowderOrderServiceImpl.java index 2a4b073b..f2047991 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BasePowderOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BasePowderOrderServiceImpl.java @@ -6,6 +6,7 @@ import java.util.Date; import java.util.List; import java.util.UUID; +import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.context.SecurityContextHolder; import com.op.common.core.web.domain.AjaxResult; import com.op.wms.domain.OdsRawStorageNews; @@ -39,6 +40,7 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService { * @return 粉料采购计划 */ @Override + @DS("#header.poolName") public BasePowderOrder selectBasePowderOrderByID(String ID) { return basePowderOrderMapper.selectBasePowderOrderByID(ID); } @@ -50,6 +52,7 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService { * @return 粉料采购计划 */ @Override + @DS("#header.poolName") public List selectBasePowderOrderList(BasePowderOrder basePowderOrder) { return basePowderOrderMapper.selectBasePowderOrderList(basePowderOrder); } @@ -61,6 +64,7 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService { * @return 结果 */ @Override + @DS("#header.poolName") public int insertBasePowderOrder(BasePowderOrder basePowderOrder) { String userName = SecurityContextHolder.getUserName(); basePowderOrder.setID(UUID.randomUUID().toString()); @@ -75,7 +79,7 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService { } - + @DS("#header.poolName") private String getPurcode(String factorycode, String orderType) { String purcode = ""; @@ -118,6 +122,7 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService { * @return 结果 */ @Override + @DS("#header.poolName") public int updateBasePowderOrder(BasePowderOrder basePowderOrder) { return basePowderOrderMapper.updateBasePowderOrder(basePowderOrder); } @@ -129,6 +134,7 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService { * @return 结果 */ @Override + @DS("#header.poolName") public int deleteBasePowderOrderByIDs(String[] IDs) { return basePowderOrderMapper.deleteBasePowderOrderByIDs(IDs); } @@ -140,12 +146,14 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService { * @return 结果 */ @Override + @DS("#header.poolName") public int deleteBasePowderOrderByID(String ID) { return basePowderOrderMapper.deleteBasePowderOrderByID(ID); } @Transactional @Override + @DS("#header.poolName") public int confirmReceipt(BasePowderOrder basePowderOrder) { BasePowderOrder basePowderOrder1 = new BasePowderOrder(); String siteCode = basePowderOrder.getSiteCode(); @@ -189,6 +197,7 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService { } @Transactional @Override + @DS("#header.poolName") public AjaxResult powderReturn(String[] iDs) { for (String id: iDs) {//只退回不合格的 diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseShiftsTServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseShiftsTServiceImpl.java index a108fe89..a312497e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseShiftsTServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseShiftsTServiceImpl.java @@ -15,7 +15,7 @@ import com.op.wms.service.IBaseShiftsTService; /** * 班次管理Service业务层处理 - * + * * @author Open Platform * @date 2023-07-06 */ @@ -26,7 +26,7 @@ public class BaseShiftsTServiceImpl implements IBaseShiftsTService { /** * 查询班次管理 - * + * * @param shiftId 班次管理主键 * @return 班次管理 */ @@ -38,7 +38,7 @@ public class BaseShiftsTServiceImpl implements IBaseShiftsTService { /** * 查询班次管理列表 - * + * * @param baseShiftsT 班次管理 * @return 班次管理 */ @@ -50,7 +50,7 @@ public class BaseShiftsTServiceImpl implements IBaseShiftsTService { /** * 新增班次管理 - * + * * @param baseShiftsT 班次管理 * @return 结果 */ @@ -107,7 +107,7 @@ public class BaseShiftsTServiceImpl implements IBaseShiftsTService { /* * 修改班次管理 - * + * * @param baseShiftsT 班次管理 * @return 结果 */ @@ -121,7 +121,7 @@ public class BaseShiftsTServiceImpl implements IBaseShiftsTService { /** * 批量删除班次管理 - * + * * @param shiftIds 需要删除的班次管理主键 * @return 结果 */ @@ -133,7 +133,7 @@ public class BaseShiftsTServiceImpl implements IBaseShiftsTService { /** * 删除班次管理信息 - * + * * @param shiftId 班次管理主键 * @return 结果 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseTeamTServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseTeamTServiceImpl.java index 38576860..064d665a 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseTeamTServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseTeamTServiceImpl.java @@ -13,7 +13,7 @@ import com.op.wms.service.IBaseTeamTService; /** * 班组Service业务层处理 - * + * * @author Open Platform * @date 2023-07-05 */ @@ -24,7 +24,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService { /** * 查询班组 - * + * * @param teamId 班组主键 * @return 班组 */ @@ -36,7 +36,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService { /** * 查询班组列表 - * + * * @param baseTeamT 班组 * @return 班组 */ @@ -48,7 +48,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService { /** * 新增班组 - * + * * @param baseTeamT 班组 * @return 结果 */ @@ -62,7 +62,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService { /** * 修改班组 - * + * * @param baseTeamT 班组 * @return 结果 */ @@ -76,7 +76,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService { /** * 批量删除班组 - * + * * @param teamIds 需要删除的班组主键 * @return 结果 */ @@ -88,7 +88,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService { /** * 删除班组信息 - * + * * @param teamId 班组主键 * @return 结果 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseWarehouseServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseWarehouseServiceImpl.java index afe23b24..f6523075 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseWarehouseServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseWarehouseServiceImpl.java @@ -13,7 +13,7 @@ import com.op.wms.service.IBaseWarehouseService; /** * 仓库管理Service业务层处理 - * + * * @author Open Platform * @date 2023-07-04 */ @@ -24,7 +24,7 @@ public class BaseWarehouseServiceImpl implements IBaseWarehouseService { /** * 查询仓库管理 - * + * * @param warehouseId 仓库管理主键 * @return 仓库管理 */ @@ -36,7 +36,7 @@ public class BaseWarehouseServiceImpl implements IBaseWarehouseService { /** * 查询仓库管理列表 - * + * * @param baseWarehouse 仓库管理 * @return 仓库管理 */ @@ -48,7 +48,7 @@ public class BaseWarehouseServiceImpl implements IBaseWarehouseService { /** * 新增仓库管理 - * + * * @param baseWarehouse 仓库管理 * @return 结果 */ @@ -65,7 +65,7 @@ public class BaseWarehouseServiceImpl implements IBaseWarehouseService { /** * 修改仓库管理 - * + * * @param baseWarehouse 仓库管理 * @return 结果 */ @@ -79,7 +79,7 @@ public class BaseWarehouseServiceImpl implements IBaseWarehouseService { /** * 批量删除仓库管理 - * + * * @param warehouseIds 需要删除的仓库管理主键 * @return 结果 */ @@ -91,7 +91,7 @@ public class BaseWarehouseServiceImpl implements IBaseWarehouseService { /** * 删除仓库管理信息 - * + * * @param warehouseId 仓库管理主键 * @return 结果 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsInventoryOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsInventoryOrderServiceImpl.java index 4124e71c..97727e5d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsInventoryOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsInventoryOrderServiceImpl.java @@ -1,6 +1,8 @@ package com.op.wms.service.impl; import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.OdsInventoryOrderMapper; @@ -9,7 +11,7 @@ import com.op.wms.service.IOdsInventoryOrderService; /** * 包材盘点单Service业务层处理 - * + * * @author Open Platform * @date 2023-07-06 */ @@ -20,66 +22,72 @@ public class OdsInventoryOrderServiceImpl implements IOdsInventoryOrderService { /** * 查询包材盘点单 - * + * * @param ID 包材盘点单主键 * @return 包材盘点单 */ @Override + @DS("#header.poolName") public OdsInventoryOrder selectOdsInventoryOrderByID(String ID) { return odsInventoryOrderMapper.selectOdsInventoryOrderByID(ID); } /** * 查询包材盘点单列表 - * + * * @param odsInventoryOrder 包材盘点单 * @return 包材盘点单 */ @Override + @DS("#header.poolName") public List selectOdsInventoryOrderList(OdsInventoryOrder odsInventoryOrder) { return odsInventoryOrderMapper.selectOdsInventoryOrderList(odsInventoryOrder); } /** * 新增包材盘点单 - * + * * @param odsInventoryOrder 包材盘点单 * @return 结果 */ @Override + @DS("#header.poolName") public int insertOdsInventoryOrder(OdsInventoryOrder odsInventoryOrder) { return odsInventoryOrderMapper.insertOdsInventoryOrder(odsInventoryOrder); } /** * 修改包材盘点单 - * + * * @param odsInventoryOrder 包材盘点单 * @return 结果 */ @Override + @DS("#header.poolName") public int updateOdsInventoryOrder(OdsInventoryOrder odsInventoryOrder) { return odsInventoryOrderMapper.updateOdsInventoryOrder(odsInventoryOrder); } /** * 批量删除包材盘点单 - * + * * @param IDs 需要删除的包材盘点单主键 * @return 结果 */ @Override + @DS("#header.poolName") public int deleteOdsInventoryOrderByIDs(String[] IDs) { return odsInventoryOrderMapper.deleteOdsInventoryOrderByIDs(IDs); } /** * 删除包材盘点单信息 - * + * * @param ID 包材盘点单主键 * @return 结果 */ @Override + @DS("#header.poolName") public int deleteOdsInventoryOrderByID(String ID) { return odsInventoryOrderMapper.deleteOdsInventoryOrderByID(ID); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index c7cb1a4a..45a513e7 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -1,6 +1,8 @@ package com.op.wms.service.impl; import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.OdsProcureOrderMapper; @@ -9,7 +11,7 @@ import com.op.wms.service.IOdsProcureOrderService; /** * 包材采购单Service业务层处理 - * + * * @author Open Platform * @date 2023-07-06 */ @@ -20,66 +22,72 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { /** * 查询包材采购单 - * + * * @param ID 包材采购单主键 * @return 包材采购单 */ @Override + @DS("#header.poolName") public OdsProcureOrder selectOdsProcureOrderByID(String ID) { return odsProcureOrderMapper.selectOdsProcureOrderByID(ID); } /** * 查询包材采购单列表 - * + * * @param odsProcureOrder 包材采购单 * @return 包材采购单 */ @Override + @DS("#header.poolName") public List selectOdsProcureOrderList(OdsProcureOrder odsProcureOrder) { return odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder); } /** * 新增包材采购单 - * + * * @param odsProcureOrder 包材采购单 * @return 结果 */ @Override + @DS("#header.poolName") public int insertOdsProcureOrder(OdsProcureOrder odsProcureOrder) { return odsProcureOrderMapper.insertOdsProcureOrder(odsProcureOrder); } /** * 修改包材采购单 - * + * * @param odsProcureOrder 包材采购单 * @return 结果 */ @Override + @DS("#header.poolName") public int updateOdsProcureOrder(OdsProcureOrder odsProcureOrder) { return odsProcureOrderMapper.updateOdsProcureOrder(odsProcureOrder); } /** * 批量删除包材采购单 - * + * * @param IDs 需要删除的包材采购单主键 * @return 结果 */ @Override + @DS("#header.poolName") public int deleteOdsProcureOrderByIDs(String[] IDs) { return odsProcureOrderMapper.deleteOdsProcureOrderByIDs(IDs); } /** * 删除包材采购单信息 - * + * * @param ID 包材采购单主键 * @return 结果 */ @Override + @DS("#header.poolName") public int deleteOdsProcureOrderByID(String ID) { return odsProcureOrderMapper.deleteOdsProcureOrderByID(ID); } 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 9a1ceb9c..31042c3a 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 @@ -1,6 +1,8 @@ package com.op.wms.service.impl; import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.OdsProcureOutOrderMapper; @@ -9,7 +11,7 @@ import com.op.wms.service.IOdsProcureOutOrderService; /** * 包材出库单Service业务层处理 - * + * * @author Open Platform * @date 2023-07-06 */ @@ -20,66 +22,72 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService /** * 查询包材出库单 - * + * * @param ID 包材出库单主键 * @return 包材出库单 */ @Override + @DS("#header.poolName") public OdsProcureOutOrder selectOdsProcureOutOrderByID(String ID) { return odsProcureOutOrderMapper.selectOdsProcureOutOrderByID(ID); } /** * 查询包材出库单列表 - * + * * @param odsProcureOutOrder 包材出库单 * @return 包材出库单 */ @Override + @DS("#header.poolName") public List selectOdsProcureOutOrderList(OdsProcureOutOrder odsProcureOutOrder) { return odsProcureOutOrderMapper.selectOdsProcureOutOrderList(odsProcureOutOrder); } /** * 新增包材出库单 - * + * * @param odsProcureOutOrder 包材出库单 * @return 结果 */ @Override + @DS("#header.poolName") public int insertOdsProcureOutOrder(OdsProcureOutOrder odsProcureOutOrder) { return odsProcureOutOrderMapper.insertOdsProcureOutOrder(odsProcureOutOrder); } /** * 修改包材出库单 - * + * * @param odsProcureOutOrder 包材出库单 * @return 结果 */ @Override + @DS("#header.poolName") public int updateOdsProcureOutOrder(OdsProcureOutOrder odsProcureOutOrder) { return odsProcureOutOrderMapper.updateOdsProcureOutOrder(odsProcureOutOrder); } /** * 批量删除包材出库单 - * + * * @param IDs 需要删除的包材出库单主键 * @return 结果 */ @Override + @DS("#header.poolName") public int deleteOdsProcureOutOrderByIDs(String[] IDs) { return odsProcureOutOrderMapper.deleteOdsProcureOutOrderByIDs(IDs); } /** * 删除包材出库单信息 - * + * * @param ID 包材出库单主键 * @return 结果 */ @Override + @DS("#header.poolName") public int deleteOdsProcureOutOrderByID(String ID) { return odsProcureOutOrderMapper.deleteOdsProcureOutOrderByID(ID); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoInventoryServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoInventoryServiceImpl.java index ceb1953e..0c68859e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoInventoryServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoInventoryServiceImpl.java @@ -1,6 +1,8 @@ package com.op.wms.service.impl; import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.OdsWhiteEmbryoInventoryMapper; @@ -9,7 +11,7 @@ import com.op.wms.service.IOdsWhiteEmbryoInventoryService; /** * 白胚盘点单Service业务层处理 - * + * * @author Open Platform * @date 2023-07-06 */ @@ -20,66 +22,72 @@ public class OdsWhiteEmbryoInventoryServiceImpl implements IOdsWhiteEmbryoInvent /** * 查询白胚盘点单 - * + * * @param ID 白胚盘点单主键 * @return 白胚盘点单 */ @Override + @DS("#header.poolName") public OdsWhiteEmbryoInventory selectOdsWhiteEmbryoInventoryByID(String ID) { return odsWhiteEmbryoInventoryMapper.selectOdsWhiteEmbryoInventoryByID(ID); } /** * 查询白胚盘点单列表 - * + * * @param odsWhiteEmbryoInventory 白胚盘点单 * @return 白胚盘点单 */ @Override + @DS("#header.poolName") public List selectOdsWhiteEmbryoInventoryList(OdsWhiteEmbryoInventory odsWhiteEmbryoInventory) { return odsWhiteEmbryoInventoryMapper.selectOdsWhiteEmbryoInventoryList(odsWhiteEmbryoInventory); } /** * 新增白胚盘点单 - * + * * @param odsWhiteEmbryoInventory 白胚盘点单 * @return 结果 */ @Override + @DS("#header.poolName") public int insertOdsWhiteEmbryoInventory(OdsWhiteEmbryoInventory odsWhiteEmbryoInventory) { return odsWhiteEmbryoInventoryMapper.insertOdsWhiteEmbryoInventory(odsWhiteEmbryoInventory); } /** * 修改白胚盘点单 - * + * * @param odsWhiteEmbryoInventory 白胚盘点单 * @return 结果 */ @Override + @DS("#header.poolName") public int updateOdsWhiteEmbryoInventory(OdsWhiteEmbryoInventory odsWhiteEmbryoInventory) { return odsWhiteEmbryoInventoryMapper.updateOdsWhiteEmbryoInventory(odsWhiteEmbryoInventory); } /** * 批量删除白胚盘点单 - * + * * @param IDs 需要删除的白胚盘点单主键 * @return 结果 */ @Override + @DS("#header.poolName") public int deleteOdsWhiteEmbryoInventoryByIDs(String[] IDs) { return odsWhiteEmbryoInventoryMapper.deleteOdsWhiteEmbryoInventoryByIDs(IDs); } /** * 删除白胚盘点单信息 - * + * * @param ID 白胚盘点单主键 * @return 结果 */ @Override + @DS("#header.poolName") public int deleteOdsWhiteEmbryoInventoryByID(String ID) { return odsWhiteEmbryoInventoryMapper.deleteOdsWhiteEmbryoInventoryByID(ID); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoServiceImpl.java index 56a9bcf8..c4dd29a1 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoServiceImpl.java @@ -1,6 +1,8 @@ package com.op.wms.service.impl; import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.OdsWhiteEmbryoMapper; @@ -9,7 +11,7 @@ import com.op.wms.service.IOdsWhiteEmbryoService; /** * 白胚出库单Service业务层处理 - * + * * @author Open Platform * @date 2023-07-06 */ @@ -20,66 +22,72 @@ public class OdsWhiteEmbryoServiceImpl implements IOdsWhiteEmbryoService { /** * 查询白胚出库单 - * + * * @param ID 白胚出库单主键 * @return 白胚出库单 */ @Override + @DS("#header.poolName") public OdsWhiteEmbryo selectOdsWhiteEmbryoByID(String ID) { return odsWhiteEmbryoMapper.selectOdsWhiteEmbryoByID(ID); } /** * 查询白胚出库单列表 - * + * * @param odsWhiteEmbryo 白胚出库单 * @return 白胚出库单 */ @Override + @DS("#header.poolName") public List selectOdsWhiteEmbryoList(OdsWhiteEmbryo odsWhiteEmbryo) { return odsWhiteEmbryoMapper.selectOdsWhiteEmbryoList(odsWhiteEmbryo); } /** * 新增白胚出库单 - * + * * @param odsWhiteEmbryo 白胚出库单 * @return 结果 */ @Override + @DS("#header.poolName") public int insertOdsWhiteEmbryo(OdsWhiteEmbryo odsWhiteEmbryo) { return odsWhiteEmbryoMapper.insertOdsWhiteEmbryo(odsWhiteEmbryo); } /** * 修改白胚出库单 - * + * * @param odsWhiteEmbryo 白胚出库单 * @return 结果 */ @Override + @DS("#header.poolName") public int updateOdsWhiteEmbryo(OdsWhiteEmbryo odsWhiteEmbryo) { return odsWhiteEmbryoMapper.updateOdsWhiteEmbryo(odsWhiteEmbryo); } /** * 批量删除白胚出库单 - * + * * @param IDs 需要删除的白胚出库单主键 * @return 结果 */ @Override + @DS("#header.poolName") public int deleteOdsWhiteEmbryoByIDs(String[] IDs) { return odsWhiteEmbryoMapper.deleteOdsWhiteEmbryoByIDs(IDs); } /** * 删除白胚出库单信息 - * + * * @param ID 白胚出库单主键 * @return 结果 */ @Override + @DS("#header.poolName") public int deleteOdsWhiteEmbryoByID(String ID) { return odsWhiteEmbryoMapper.deleteOdsWhiteEmbryoByID(ID); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/PowderChargeOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/PowderChargeOrderServiceImpl.java index 2093502e..655deef8 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/PowderChargeOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/PowderChargeOrderServiceImpl.java @@ -1,15 +1,26 @@ package com.op.wms.service.impl; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; +import java.util.UUID; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.context.SecurityContextHolder; +import com.op.wms.domain.Purcode; +import com.op.wms.mapper.PowderChargeOrderRecordMapper; +import com.op.wms.mapper.PurcodeMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.PowderChargeOrderMapper; import com.op.wms.domain.PowderChargeOrder; import com.op.wms.service.IPowderChargeOrderService; +import org.springframework.transaction.annotation.Transactional; /** * 粉料配料Service业务层处理 - * + * * @author Open Platform * @date 2023-07-10 */ @@ -18,69 +29,180 @@ public class PowderChargeOrderServiceImpl implements IPowderChargeOrderService { @Autowired private PowderChargeOrderMapper powderChargeOrderMapper; + @Autowired + private PurcodeMapper purcodeMapper; + + @Autowired + private PowderChargeOrderRecordMapper powderChargeOrderRecordMapper; + /** * 查询粉料配料 - * + * * @param ID 粉料配料主键 * @return 粉料配料 */ @Override + @DS("#header.poolName") public PowderChargeOrder selectPowderChargeOrderByID(String ID) { return powderChargeOrderMapper.selectPowderChargeOrderByID(ID); } /** * 查询粉料配料列表 - * + * * @param powderChargeOrder 粉料配料 * @return 粉料配料 */ @Override + @DS("#header.poolName") public List selectPowderChargeOrderList(PowderChargeOrder powderChargeOrder) { return powderChargeOrderMapper.selectPowderChargeOrderList(powderChargeOrder); } /** * 新增粉料配料 - * + * * @param powderChargeOrder 粉料配料 * @return 结果 */ @Override + @DS("#header.poolName") public int insertPowderChargeOrder(PowderChargeOrder powderChargeOrder) { return powderChargeOrderMapper.insertPowderChargeOrder(powderChargeOrder); } /** * 修改粉料配料 - * + * * @param powderChargeOrder 粉料配料 * @return 结果 */ @Override + @DS("#header.poolName") public int updatePowderChargeOrder(PowderChargeOrder powderChargeOrder) { return powderChargeOrderMapper.updatePowderChargeOrder(powderChargeOrder); } /** * 批量删除粉料配料 - * + * * @param IDs 需要删除的粉料配料主键 * @return 结果 */ @Override + @DS("#header.poolName") public int deletePowderChargeOrderByIDs(String[] IDs) { return powderChargeOrderMapper.deletePowderChargeOrderByIDs(IDs); } /** * 删除粉料配料信息 - * + * * @param ID 粉料配料主键 * @return 结果 */ @Override + @DS("#header.poolName") public int deletePowderChargeOrderByID(String ID) { return powderChargeOrderMapper.deletePowderChargeOrderByID(ID); } + + @Override + @DS("#header.poolName") + public int insertPowderChargeOrderAdd(List powderChargeOrders) { + String userName = SecurityContextHolder.getUserName(); + Integer tem=0; + for (PowderChargeOrder powderChargeOrder: + powderChargeOrders) { + String orderCode =getPurcode(null,"PL"); + powderChargeOrder.setID(UUID.randomUUID().toString()); + powderChargeOrder.setCreateDate(new Date()); + powderChargeOrder.setOrderCode(orderCode); + powderChargeOrder.setOrderStatus("1"); + powderChargeOrder.setCreateBy(userName); + powderChargeOrder.setActive("1"); + powderChargeOrder.setUserDefined1("PL"); + tem = powderChargeOrderMapper.insertPowderChargeOrder(powderChargeOrder); + } + return tem; + } + + @Override + @DS("#header.poolName") + public PowderChargeOrder selectPowderChargeOrderByOrderCode(String orderCode) { + return powderChargeOrderMapper.selectPowderChargeOrderByOrderCode(orderCode); + } + + /**.1修改订单------累计投料数， + * 修改订单状态为进行中（2），，当投料数等于需求数时修改订单状态为完成（3） + * 减少库存--,并且系统生成出库投料记录, + * @param powderChargeOrder + * @return + */ + @Transactional + @Override + @DS("#header.poolName") + public int scOutPowderChargeOrder(PowderChargeOrder powderChargeOrder) { + PowderChargeOrder powderChargeOrder1 =powderChargeOrderMapper.selectPowderChargeOrderByID(powderChargeOrder.getID()); + BigDecimal realityNumber1 = powderChargeOrder1.getRealityNumber();//累计投料数 + BigDecimal realityNumber = powderChargeOrder.getRealityNumber(); + BigDecimal planNumber =powderChargeOrder1.getPlanNumber(); + boolean isEqual = realityNumber1.add(realityNumber).equals(planNumber); + // 判断realityNumber1 加 realityNumber 是否等于 planNumber + // 如果等于，则返回true，否则返回false + if (isEqual){ + powderChargeOrder.setOrderStatus("3"); + }else { + powderChargeOrder.setOrderStatus("2"); + } + powderChargeOrderMapper.updatePowderChargeOrderTon(powderChargeOrder); + powderChargeOrderMapper.updateOdsRawStorageNews(powderChargeOrder); + powderChargeOrder.setID(UUID.randomUUID().toString()); + Integer tem = powderChargeOrderRecordMapper.insertPowderChargeOrderRecord(powderChargeOrder); + return tem; + } + + @Override + public List getSCoutInfoRecord(PowderChargeOrder powderChargeOrder) { + return powderChargeOrderRecordMapper.selectPowderChargeOrderRecordList(powderChargeOrder); + } + + @DS("#header.poolName") + private String getPurcode(String factorycode, String orderType) { + + String purcode = ""; + String curDate = new SimpleDateFormat("yyyyMMdd").format(new Date()); + + Integer vaule = purcodeMapper.queryCurValue(orderType, curDate); + if (vaule == null) { + Purcode purcodeO = new Purcode(); + purcodeO.setCurDate(curDate); + purcodeO.setOrderType(orderType); + purcodeO.setValue(1); + int count = purcodeMapper.insert(purcodeO); + if (count != 1) { + return ""; + } + if (factorycode != null && !factorycode.equals("")) { + purcode = orderType + factorycode + curDate.substring(2) + String.format("%04d", 1); + } else { + purcode = orderType + curDate.substring(2) + String.format("%04d", 1); + } + + } else { + int count = purcodeMapper.updateCurValue(orderType, curDate, vaule); + if (count != 1) { + return ""; + } + + if (factorycode != null && !factorycode.equals("")) { + purcode = orderType + factorycode + curDate.substring(2) + String.format("%04d", vaule + 1); + } else { + purcode = orderType + curDate.substring(2) + String.format("%04d", vaule + 1); + } + } + return purcode; + } + + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java index 46caed89..38177af3 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java @@ -13,7 +13,7 @@ import com.op.wms.service.ISysFactoryService; /** * 工厂模型Service业务层处理 - * + * * @author Open Platform * @date 2023-07-03 */ @@ -24,7 +24,7 @@ public class SysFactoryServiceImpl implements ISysFactoryService { /** * 查询工厂模型 - * + * * @param factoryId 工厂模型主键 * @return 工厂模型 */ @@ -36,7 +36,7 @@ public class SysFactoryServiceImpl implements ISysFactoryService { /** * 查询工厂模型列表 - * + * * @param sysFactory 工厂模型 * @return 工厂模型 */ @@ -48,7 +48,7 @@ public class SysFactoryServiceImpl implements ISysFactoryService { /** * 新增工厂模型 - * + * * @param sysFactory 工厂模型 * @return 结果 */ @@ -62,7 +62,7 @@ public class SysFactoryServiceImpl implements ISysFactoryService { /** * 修改工厂模型 - * + * * @param sysFactory 工厂模型 * @return 结果 */ @@ -76,7 +76,7 @@ public class SysFactoryServiceImpl implements ISysFactoryService { /** * 批量删除工厂模型 - * + * * @param factoryIds 需要删除的工厂模型主键 * @return 结果 */ @@ -88,7 +88,7 @@ public class SysFactoryServiceImpl implements ISysFactoryService { /** * 删除工厂模型信息 - * + * * @param factoryId 工厂模型主键 * @return 结果 */ diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/PowderChargeOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/PowderChargeOrderMapper.xml index 10be2bd8..d6e1648c 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/PowderChargeOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/PowderChargeOrderMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -36,15 +36,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select Site_code, ID, Order_Code, Material_Code, Material_Desc, Plan_Date, Plan_Number, Unit, Reality_Number, 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, Remark, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code from powder_charge_order + select Site_code, ID, Order_Code, Material_Code, Material_Desc, Plan_Date, Plan_Number, Unit, Reality_Number, 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, Remark, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code,wl_code from powder_charge_order - + - + insert into powder_charge_order @@ -117,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" Active, Enterprise_Id, Enterprise_Code, + wl_code, #{siteCode}, @@ -150,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{Active}, #{enterpriseId}, #{enterpriseCode}, + #{wlCode}, @@ -195,9 +201,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from powder_charge_order where ID in + delete from powder_charge_order where ID in #{ID} - \ No newline at end of file + update powder_charge_order set Reality_Number =Reality_Number+ #{realityNumber}, + Order_Status = #{orderStatus}, + Last_Update_Date = now() + where ID=#{ID} + + update ods_raw_storage_news set storage_amount =storage_amount- #{realityNumber}, + gmt_modified = now() + where material_code=#{materialCode} AND wl_code=#{wlCode} + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/PowderChargeOrderRecordMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/PowderChargeOrderRecordMapper.xml new file mode 100644 index 00000000..f3a54425 --- /dev/null +++ b/op-modules/op-wms/src/main/resources/mapper/wms/PowderChargeOrderRecordMapper.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into powder_charge_order_record + + Site_code, + ID, + Order_Code, + Material_Code, + Material_Desc, + Plan_Date, + Plan_Number, + Unit, + Reality_Number, + 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, + Remark, + Create_By, + Create_Date, + Last_Update_By, + Last_Update_Date, + Active, + Enterprise_Id, + Enterprise_Code, + wl_code, + + + #{siteCode}, + #{ID}, + #{orderCode}, + #{materialCode}, + #{materialDesc}, + #{planDate}, + #{planNumber}, + #{Unit}, + #{realityNumber}, + #{orderStatus}, + #{userDefined1}, + #{userDefined2}, + #{userDefined3}, + #{userDefined4}, + #{userDefined5}, + #{userDefined6}, + #{userDefined7}, + #{userDefined8}, + #{userDefined9}, + #{userDefined10}, + #{userDefined11}, + #{supplierCode}, + #{supplierName}, + #{Remark}, + #{createBy}, + #{createDate}, + #{lastUpdateBy}, + #{lastUpdateDate}, + #{Active}, + #{enterpriseId}, + #{enterpriseCode}, + #{wlCode}, + + + + select Site_code, ID, Order_Code, Material_Code, Material_Desc, Plan_Date, Plan_Number, Unit, Reality_Number, 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, Remark, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code,wl_code from powder_charge_order_record + + +