From 561d0f686fba84480eb7c073f72867ff9c353aa2 Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Fri, 16 Jul 2021 09:38:11 +0800 Subject: [PATCH] =?UTF-8?q?ERP=E6=8A=A5=E5=B7=A5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../controller/ItemBatchController.java | 144 +++++++----------- .../controller/SfcDispatchController.java | 3 +- .../SurplusItemReturnController.java | 4 +- .../mapper/SurplusItemReturnMapper.java | 3 +- .../dispatch/model/ShopOrderRelease.java | 16 +- .../dispatch/model/SurplusItemReturn.java | 56 ++++--- .../service/SurplusItemReturnService.java | 3 +- .../impl/SurplusItemReturnServiceImpl.java | 5 +- .../resources/mapper/SfcDispatchMapper.xml | 6 +- .../mapper/SurplusItemReturnMapper.xml | 50 +++--- 11 files changed, 150 insertions(+), 142 deletions(-) diff --git a/console/src/main/resources/application-dev.yml b/console/src/main/resources/application-dev.yml index 84f10ff4..8f182ed2 100644 --- a/console/src/main/resources/application-dev.yml +++ b/console/src/main/resources/application-dev.yml @@ -8,7 +8,7 @@ spring: driver-class-name: com.sap.db.jdbc.Driver jndi-name: jdbc/jts/wipPool activemq: - enabled: true + enabled: false brokerUrl: tcp://121.36.58.109:61616?wireFormat.maxInactivityDuration=0 password: admin user: admin diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ItemBatchController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ItemBatchController.java index 1c63ee1a..4cc21e66 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ItemBatchController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ItemBatchController.java @@ -1,5 +1,10 @@ package com.foreverwin.mesnac.dispatch.controller; +import com.foreverwin.mesnac.common.erp.ZprodordconfStruIn; +import com.foreverwin.mesnac.common.erp.ZprodordconfStruOut; +import com.foreverwin.mesnac.common.erp.holders.TableOfZprodordconfStruInHolder; +import com.foreverwin.mesnac.common.erp.holders.TableOfZprodordconfStruOutHolder; +import com.foreverwin.mesnac.common.util.ERPAPI; import com.foreverwin.modular.core.util.R; import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.CommonMethods; @@ -11,6 +16,8 @@ import org.springframework.web.bind.annotation.*; import com.foreverwin.mesnac.dispatch.service.ItemBatchService; import com.foreverwin.mesnac.dispatch.model.ItemBatch; + +import java.math.BigDecimal; import java.util.List; /** @@ -25,103 +32,56 @@ public class ItemBatchController { @Autowired public ItemBatchService itemBatchService; - /** - * 根据id查询 - * - * @param id 主键 - * @return - */ - @ResponseBody - @GetMapping("/{id:.+}") - public R getItemBatchById(@PathVariable String id) { - return R.ok( itemBatchService.getById(id)); - } + @GetMapping("/testErpJK") + public R testErpJK (String shopOrder, String stepId) { - /** - * 查询所有数据 - * - * @return - */ - @ResponseBody - @GetMapping("") - public R getItemBatchList(ItemBatch itemBatch){ - List result; - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(itemBatch); - result = itemBatchService.list(queryWrapper); - return R.ok(result); - } + try { + //请求参数 + ZprodordconfStruIn[] ins = new ZprodordconfStruIn[1]; - /** - * 分页查询数据 - * - * @param frontPage 分页信息 - * @return - */ - @ResponseBody - @GetMapping("/page") - public R page(FrontPage frontPage, ItemBatch itemBatch){ - IPage result; - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(itemBatch); - if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { - //TODO modify global query - queryWrapper.lambda().and(wrapper -> wrapper - .like(ItemBatch::getHandle, frontPage.getGlobalQuery()) - .or().like(ItemBatch::getSite, frontPage.getGlobalQuery()) - .or().like(ItemBatch::getFactory, frontPage.getGlobalQuery()) - .or().like(ItemBatch::getItem, frontPage.getGlobalQuery()) - .or().like(ItemBatch::getBatch, frontPage.getGlobalQuery()) - .or().like(ItemBatch::getSupplier, frontPage.getGlobalQuery()) - .or().like(ItemBatch::getLabel, frontPage.getGlobalQuery()) - .or().like(ItemBatch::getIsPrint, frontPage.getGlobalQuery()) - .or().like(ItemBatch::getCreateUser, frontPage.getGlobalQuery()) - .or().like(ItemBatch::getModifyUser, frontPage.getGlobalQuery()) - ); - } - result = itemBatchService.page(frontPage.getPagePlus(), queryWrapper); - return R.ok(result); - } + ZprodordconfStruIn struIn = new ZprodordconfStruIn(); + //生产订单 + struIn.setAufnr(shopOrder); + //步骤标示 + struIn.setVornr(stepId); + struIn.setAueru("1"); + //良品数量 + struIn.setLmnga(new BigDecimal(10)); + //报废数量 + struIn.setXmnga(new BigDecimal(1)); + //机器工时 + struIn.setIsm01(new BigDecimal(1)); + //人工工时 + struIn.setIsm02(new BigDecimal(1)); + struIn.setIsm03(new BigDecimal(1)); + struIn.setIsm04(new BigDecimal(1)); + struIn.setIsm05(new BigDecimal(1)); + struIn.setIsm06(new BigDecimal(1)); + ins[0] = struIn; + TableOfZprodordconfStruInHolder inHolder = new TableOfZprodordconfStruInHolder(ins); - /** - * 新增 - * @param itemBatch 传递的实体 - * @return null 失败 实体成功 - */ - @PostMapping - public R save(@RequestBody ItemBatch itemBatch) { - return R.ok(itemBatchService.save(itemBatch)); - } + //返回对象 + ZprodordconfStruOut[] outs = new ZprodordconfStruOut[1]; - /** - * 修改 - * @param itemBatch 传递的实体 - * @return null 失败 实体成功 - */ - @PutMapping - public R updateById(@RequestBody ItemBatch itemBatch) { - return R.ok(itemBatchService.updateById(itemBatch)); - } + ZprodordconfStruOut struOut = new ZprodordconfStruOut(); + struOut.setAufnr(shopOrder); + struOut.setVornr(stepId); + struOut.setAueru("1"); + struOut.setLmnga(new BigDecimal(1)); + struOut.setRet(""); + struOut.setMsg(""); + outs[0] = struOut; + TableOfZprodordconfStruOutHolder outHolder = new TableOfZprodordconfStruOutHolder(outs); - /** - * 根据id删除对象 - * @param id 实体ID - * @return 0 失败 1 成功 - */ - @ResponseBody - @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") - public R removeById(@PathVariable("id") String id){ - return R.ok(itemBatchService.removeById(id)); - } + //调用WS + ERPAPI.erpWebService().zmesProdordconf(inHolder, outHolder); + //状态： S|成功， E|失败 + String status = outHolder.value[1].getRet(); + String message = outHolder.value[1].getMsg(); - /** - * 批量删除对象 - * @param ids 实体集合ID - * @return 0 失败 1 成功 - */ - @ResponseBody - @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") - public R removeByIds(List ids){ - return R.ok(itemBatchService.removeByIds(ids)); + return R.failed("ERP接口返回：状态:" + status + ",消息:" + message); + } catch (Exception e) { + return R.ok(e.getMessage()); + } } } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java index 8a00ce6d..2e6466eb 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java @@ -63,7 +63,7 @@ public class SfcDispatchController { */ @ResponseBody @GetMapping("getSfcDispatch") - public R getSfcDispatch(String workCenter, String dispatchStatus, String item, String workOrder, String shopOrder, + public R getSfcDispatch(String workCenter, String dispatchStatus, String item, String itemNumber, String workOrder, String shopOrder, String resrce, String resourceType, String operation, String sfc, String componentDescription, String turnOperation, String isDispatch, String startFromDate_S, String startToDate_S, String completeFromDate_S, String completeToDate_S) { List list; @@ -73,6 +73,7 @@ public class SfcDispatchController { shopOrderRelease.setWorkCenter(workCenter); shopOrderRelease.setDispatchStatus(dispatchStatus); shopOrderRelease.setItem(item); + shopOrderRelease.setItemNumber(itemNumber); shopOrderRelease.setWorkOrder(workOrder); shopOrderRelease.setShopOrder(shopOrder); shopOrderRelease.setResrce(resrce); diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SurplusItemReturnController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SurplusItemReturnController.java index ef37c6f8..bb853024 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SurplusItemReturnController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SurplusItemReturnController.java @@ -52,7 +52,7 @@ public class SurplusItemReturnController { @ResponseBody @GetMapping("/surplusReturn") - public R surplusReturn(String inventory, String length, String width, String qty) { + public R surplusReturn(String inventory, String length, String width, String numbers, String qty) { try { if (StringUtil.isBlank(inventory)) { throw BusinessException.build("物料条码不能为空！"); @@ -66,7 +66,7 @@ public class SurplusItemReturnController { String site = CommonMethods.getSite(); String user = CommonMethods.getUser(); - surplusItemReturnService.surplusReturn(site, user, inventory, length, width, new BigDecimal(qty)); + surplusItemReturnService.surplusReturn(site, user, inventory, length, width, new BigDecimal(numbers), new BigDecimal(qty)); } catch (Exception e) { return R.failed(e.getMessage()); } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusItemReturnMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusItemReturnMapper.java index ae208394..136951ae 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusItemReturnMapper.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusItemReturnMapper.java @@ -13,11 +13,12 @@ import java.util.Map; *

* * @author Leon.L - * @since 2021-07-10 + * @since 2021-07-15 */ @Repository public interface SurplusItemReturnMapper extends BaseMapper { + /** * 查询库存信息 * diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java index a03785ee..7a1b5345 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java @@ -1,10 +1,6 @@ package com.foreverwin.mesnac.dispatch.model; -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.foreverwin.mesnac.common.model.ExcelColumn; - import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.Date; @@ -49,6 +45,10 @@ public class ShopOrderRelease extends SfcDispatch { * 工单自定义字段-工单备注 */ private String comments; + /** + * 工单自定义字段-项目号 + */ + private String itemNumber; /** * 工单自定义字段-工作令号 */ @@ -166,6 +166,14 @@ public class ShopOrderRelease extends SfcDispatch { this.comments = comments; } + public String getItemNumber() { + return itemNumber; + } + + public void setItemNumber(String itemNumber) { + this.itemNumber = itemNumber; + } + public String getWorkOrder() { return workOrder; } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SurplusItemReturn.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SurplusItemReturn.java index 99b99826..51212886 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SurplusItemReturn.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SurplusItemReturn.java @@ -18,7 +18,7 @@ import com.baomidou.mybatisplus.annotation.IdType; *

* * @author Leon.L - * @since 2021-07-10 + * @since 2021-07-15 */ @TableName("Z_SURPLUS_ITEM_RETURN") @@ -61,6 +61,11 @@ public class SurplusItemReturn extends Model { */ @TableField("WIDTH") private String width; + /** + * 件数 + */ + @TableField("NUMBERS") + private BigDecimal numbers; /** * 余料数量 */ @@ -79,8 +84,8 @@ public class SurplusItemReturn extends Model { /** * 更新用户 */ - @TableField("MODIFU_USER") - private String modifuUser; + @TableField("MODIFY_USER") + private String modifyUser; /** * 更新时间 */ @@ -144,6 +149,14 @@ public class SurplusItemReturn extends Model { this.width = width; } + public BigDecimal getNumbers() { + return numbers; + } + + public void setNumbers(BigDecimal numbers) { + this.numbers = numbers; + } + public BigDecimal getQty() { return qty; } @@ -168,12 +181,12 @@ public class SurplusItemReturn extends Model { this.createdDateTime = createdDateTime; } - public String getModifuUser() { - return modifuUser; + public String getModifyUser() { + return modifyUser; } - public void setModifuUser(String modifuUser) { - this.modifuUser = modifuUser; + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; } public LocalDateTime getModifiedDateTime() { @@ -184,29 +197,31 @@ public class SurplusItemReturn extends Model { this.modifiedDateTime = modifiedDateTime; } -public static final String HANDLE = "HANDLE"; + public static final String HANDLE = "HANDLE"; + + public static final String SITE = "SITE"; -public static final String SITE = "SITE"; + public static final String INVENTORY = "INVENTORY"; -public static final String INVENTORY = "INVENTORY"; + public static final String PARENT_INVENTORY = "PARENT_INVENTORY"; -public static final String PARENT_INVENTORY = "PARENT_INVENTORY"; + public static final String ITEM_BO = "ITEM_BO"; -public static final String ITEM_BO = "ITEM_BO"; + public static final String LENGHT = "LENGHT"; -public static final String LENGHT = "LENGHT"; + public static final String WIDTH = "WIDTH"; -public static final String WIDTH = "WIDTH"; + public static final String NUMBERS = "NUMBERS"; -public static final String QTY = "QTY"; + public static final String QTY = "QTY"; -public static final String CREATE_USER = "CREATE_USER"; + public static final String CREATE_USER = "CREATE_USER"; -public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; -public static final String MODIFU_USER = "MODIFU_USER"; + public static final String MODIFY_USER = "MODIFY_USER"; -public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; @Override @@ -224,10 +239,11 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; ", itemBo = " + itemBo + ", lenght = " + lenght + ", width = " + width + + ", numbers = " + numbers + ", qty = " + qty + ", createUser = " + createUser + ", createdDateTime = " + createdDateTime + - ", modifuUser = " + modifuUser + + ", modifyUser = " + modifyUser + ", modifiedDateTime = " + modifiedDateTime + "}"; } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusItemReturnService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusItemReturnService.java index d863294b..43c3bee3 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusItemReturnService.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusItemReturnService.java @@ -36,7 +36,8 @@ public interface SurplusItemReturnService extends IService { * @param inventory * @param length * @param width + * @param numbers * @param qty */ - void surplusReturn(String site, String user, String inventory, String length, String width, BigDecimal qty); + void surplusReturn(String site, String user, String inventory, String length, String width, BigDecimal numbers, BigDecimal qty); } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusItemReturnServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusItemReturnServiceImpl.java index 039faf78..54b75405 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusItemReturnServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusItemReturnServiceImpl.java @@ -82,7 +82,7 @@ public class SurplusItemReturnServiceImpl extends ServiceImpl AND C1.VALUE LIKE '%' ||#{workOrder}|| '%' + + AND C2.VALUE LIKE '%' ||#{itemNumber}|| '%' + AND SD.SHOP_ORDER = #{shopOrder} diff --git a/dispatch/src/main/resources/mapper/SurplusItemReturnMapper.xml b/dispatch/src/main/resources/mapper/SurplusItemReturnMapper.xml index 63b64e5b..57f5513a 100644 --- a/dispatch/src/main/resources/mapper/SurplusItemReturnMapper.xml +++ b/dispatch/src/main/resources/mapper/SurplusItemReturnMapper.xml @@ -11,16 +11,17 @@ + - + - HANDLE, SITE, INVENTORY, PARENT_INVENTORY, ITEM_BO, LENGHT, WIDTH, QTY, CREATE_USER, CREATED_DATE_TIME, MODIFU_USER, MODIFIED_DATE_TIME + HANDLE, SITE, INVENTORY, PARENT_INVENTORY, ITEM_BO, LENGHT, WIDTH, NUMBERS, QTY, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME @@ -61,10 +62,11 @@ AND ITEM_BO=#{ew.entity.itemBo} AND LENGHT=#{ew.entity.lenght} AND WIDTH=#{ew.entity.width} + AND NUMBERS=#{ew.entity.numbers} AND QTY=#{ew.entity.qty} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND MODIFU_USER=#{ew.entity.modifuUser} + AND MODIFY_USER=#{ew.entity.modifyUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -83,10 +85,11 @@ AND ITEM_BO=#{ew.entity.itemBo} AND LENGHT=#{ew.entity.lenght} AND WIDTH=#{ew.entity.width} + AND NUMBERS=#{ew.entity.numbers} AND QTY=#{ew.entity.qty} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND MODIFU_USER=#{ew.entity.modifuUser} + AND MODIFY_USER=#{ew.entity.modifyUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -113,10 +116,11 @@ AND ITEM_BO=#{ew.entity.itemBo} AND LENGHT=#{ew.entity.lenght} AND WIDTH=#{ew.entity.width} + AND NUMBERS=#{ew.entity.numbers} AND QTY=#{ew.entity.qty} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND MODIFU_USER=#{ew.entity.modifuUser} + AND MODIFY_USER=#{ew.entity.modifyUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -143,10 +147,11 @@ AND ITEM_BO=#{ew.entity.itemBo} AND LENGHT=#{ew.entity.lenght} AND WIDTH=#{ew.entity.width} + AND NUMBERS=#{ew.entity.numbers} AND QTY=#{ew.entity.qty} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND MODIFU_USER=#{ew.entity.modifuUser} + AND MODIFY_USER=#{ew.entity.modifyUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -173,10 +178,11 @@ AND ITEM_BO=#{ew.entity.itemBo} AND LENGHT=#{ew.entity.lenght} AND WIDTH=#{ew.entity.width} + AND NUMBERS=#{ew.entity.numbers} AND QTY=#{ew.entity.qty} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND MODIFU_USER=#{ew.entity.modifuUser} + AND MODIFY_USER=#{ew.entity.modifyUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -203,10 +209,11 @@ AND ITEM_BO=#{ew.entity.itemBo} AND LENGHT=#{ew.entity.lenght} AND WIDTH=#{ew.entity.width} + AND NUMBERS=#{ew.entity.numbers} AND QTY=#{ew.entity.qty} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND MODIFU_USER=#{ew.entity.modifuUser} + AND MODIFY_USER=#{ew.entity.modifyUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -233,10 +240,11 @@ AND ITEM_BO=#{ew.entity.itemBo} AND LENGHT=#{ew.entity.lenght} AND WIDTH=#{ew.entity.width} + AND NUMBERS=#{ew.entity.numbers} AND QTY=#{ew.entity.qty} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND MODIFU_USER=#{ew.entity.modifuUser} + AND MODIFY_USER=#{ew.entity.modifyUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -259,10 +267,11 @@ ITEM_BO, LENGHT, WIDTH, + NUMBERS, QTY, CREATE_USER, CREATED_DATE_TIME, - MODIFU_USER, + MODIFY_USER, MODIFIED_DATE_TIME, VALUES @@ -273,10 +282,11 @@ #{itemBo}, #{lenght}, #{width}, + #{numbers}, #{qty}, #{createUser}, #{createdDateTime}, - #{modifuUser}, + #{modifyUser}, #{modifiedDateTime}, @@ -294,10 +304,11 @@ #{itemBo}, #{lenght}, #{width}, + #{numbers}, #{qty}, #{createUser}, #{createdDateTime}, - #{modifuUser}, + #{modifyUser}, #{modifiedDateTime}, @@ -311,10 +322,11 @@ ITEM_BO=#{et.itemBo}, LENGHT=#{et.lenght}, WIDTH=#{et.width}, + NUMBERS=#{et.numbers}, QTY=#{et.qty}, CREATE_USER=#{et.createUser}, CREATED_DATE_TIME=#{et.createdDateTime}, - MODIFU_USER=#{et.modifuUser}, + MODIFY_USER=#{et.modifyUser}, MODIFIED_DATE_TIME=#{et.modifiedDateTime}, WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} @@ -328,10 +340,11 @@ ITEM_BO=#{et.itemBo}, LENGHT=#{et.lenght}, WIDTH=#{et.width}, + NUMBERS=#{et.numbers}, QTY=#{et.qty}, CREATE_USER=#{et.createUser}, CREATED_DATE_TIME=#{et.createdDateTime}, - MODIFU_USER=#{et.modifuUser}, + MODIFY_USER=#{et.modifyUser}, MODIFIED_DATE_TIME=#{et.modifiedDateTime}, WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} @@ -345,10 +358,11 @@ ITEM_BO=#{et.itemBo}, LENGHT=#{et.lenght}, WIDTH=#{et.width}, + NUMBERS=#{et.numbers}, QTY=#{et.qty}, CREATE_USER=#{et.createUser}, CREATED_DATE_TIME=#{et.createdDateTime}, - MODIFU_USER=#{et.modifuUser}, + MODIFY_USER=#{et.modifyUser}, MODIFIED_DATE_TIME=#{et.modifiedDateTime}, @@ -361,10 +375,11 @@ AND ITEM_BO=#{ew.entity.itemBo} AND LENGHT=#{ew.entity.lenght} AND WIDTH=#{ew.entity.width} + AND NUMBERS=#{ew.entity.numbers} AND QTY=#{ew.entity.qty} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND MODIFU_USER=#{ew.entity.modifuUser} + AND MODIFY_USER=#{ew.entity.modifyUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -408,10 +423,11 @@ AND ITEM_BO=#{ew.entity.itemBo} AND LENGHT=#{ew.entity.lenght} AND WIDTH=#{ew.entity.width} + AND NUMBERS=#{ew.entity.numbers} AND QTY=#{ew.entity.qty} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND MODIFU_USER=#{ew.entity.modifuUser} + AND MODIFY_USER=#{ew.entity.modifyUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}