Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ERP报工接口测试

Browse Source
Leon 4 years ago
parent ce7ed6f618
commit 561d0f686f
11 changed files with 150 additions and 142 deletions
Show Stats Download Patch File Download Diff File

2
console/src/main/resources/application-dev.yml
Unescape Escape View File

@ -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

144
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ItemBatchController.java
Unescape Escape View File

@ -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<ItemBatch> result;
QueryWrapper<ItemBatch> 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<ItemBatch> frontPage, ItemBatch itemBatch){
IPage result;
QueryWrapper<ItemBatch> 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<String> ids){
return R.ok(itemBatchService.removeByIds(ids));
return R.failed("ERP接口返回：状态:" + status + ",消息:" + message);
} catch (Exception e) {
return R.ok(e.getMessage());
}
}
}

3
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
Unescape Escape View File

@ -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<ShopOrderRelease> 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);

4
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SurplusItemReturnController.java
Unescape Escape View File

@ -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());
}

3
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusItemReturnMapper.java
Unescape Escape View File

@ -13,11 +13,12 @@ import java.util.Map;
* </p>
*
* @author Leon.L
* @since 2021-07-10
* @since 2021-07-15
*/
@Repository
public interface SurplusItemReturnMapper extends BaseMapper<SurplusItemReturn> {
/**
* 查询库存信息
*

16
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java
Unescape Escape View File

@ -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;
}

56
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SurplusItemReturn.java
Unescape Escape View File

@ -18,7 +18,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
* </p>
*
* @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<SurplusItemReturn> {
*/
@TableField("WIDTH")
private String width;
/**
* 件数
*/
@TableField("NUMBERS")
private BigDecimal numbers;
/**
* 余料数量
*/
@ -79,8 +84,8 @@ public class SurplusItemReturn extends Model<SurplusItemReturn> {
/**
* 更新用户
*/
@TableField("MODIFU_USER")
private String modifuUser;
@TableField("MODIFY_USER")
private String modifyUser;
/**
* 更新时间
*/
@ -144,6 +149,14 @@ public class SurplusItemReturn extends Model<SurplusItemReturn> {
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<SurplusItemReturn> {
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<SurplusItemReturn> {
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 +
"}";
}

3
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusItemReturnService.java
Unescape Escape View File

@ -36,7 +36,8 @@ public interface SurplusItemReturnService extends IService<SurplusItemReturn> {
* @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);
}

5
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusItemReturnServiceImpl.java
Unescape Escape View File

@ -82,7 +82,7 @@ public class SurplusItemReturnServiceImpl extends ServiceImpl<SurplusItemReturnM
}
@Override
public void surplusReturn(String site, String user, String inventory, String length, String width, BigDecimal qty) {
public void surplusReturn(String site, String user, String inventory, String length, String width, BigDecimal numbers, BigDecimal qty) {
String inventoryBo = HandleEnum.INVENTORY.getHandle(site, inventory);
Inventory inventoryModel = inventoryService.getById(inventoryBo);
if (inventoryModel == null) {
@ -144,10 +144,11 @@ public class SurplusItemReturnServiceImpl extends ServiceImpl<SurplusItemReturnM
surplusItemReturn.setLenght(length);
surplusItemReturn.setWidth(width);
surplusItemReturn.setItemBo(inventoryModel.getItemBo());
surplusItemReturn.setNumbers(numbers);
surplusItemReturn.setQty(qty);
surplusItemReturn.setCreateUser(user);
surplusItemReturn.setCreatedDateTime(dateTime);
surplusItemReturn.setModifuUser(user);
surplusItemReturn.setModifyUser(user);
surplusItemReturn.setModifiedDateTime(dateTime);
surplusItemReturnMapper.insert(surplusItemReturn);
}

6
dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
Unescape Escape View File

@ -998,7 +998,7 @@
WHEN WIP.DISPATCH_STATUS = 'PAUSE' THEN N'暂停' WHEN WIP.DISPATCH_STATUS = 'RELEASE' THEN N'发布'
END AS STATUS_NAME
FROM (
SELECT DISTINCT SD.HANDLE, SD.SITE, SD.SHOP_ORDER, SD.DISPATCH_NO, C1.VALUE WORK_ORDER, IM.HANDLE ITEM_BO, IM.ITEM, IT.DESCRIPTION ITEM_DESCRIPTION, SD.SFC, SD.DISPATCH_STATUS,
SELECT DISTINCT SD.HANDLE, SD.SITE, SD.SHOP_ORDER, SD.DISPATCH_NO, C2.VALUE ITEM_NUMBER, C1.VALUE WORK_ORDER, IM.HANDLE ITEM_BO, IM.ITEM, IT.DESCRIPTION ITEM_DESCRIPTION, SD.SFC, SD.DISPATCH_STATUS,
SD.STEP_ID, SD.OPERATION, OT.DESCRIPTION OPERATION_DESCRIPTION, SD.RESOURCE_TYPE, SD.RESRCE, SD.EMPLOYEE, SD.EMPLOYEE USER_NAME, SD.DISPATCH_QTY, SD.PROD_HOURS,
CASE WHEN OTHER_1 = 'true' THEN SD.DISPATCH_QTY ELSE 0 END COMPLETED_QTY, SD.PLANNED_START_DATE, SD.PLANNED_COMP_DATE, SD.WORK_CENTER, SD.IS_DISPATCH,
SD.ACTUAL_START_DATE, SD.ACTUAL_COMPLETE_DATE, SD.REMARK, SD.DISPATCH_SEQ, SD.DISPATCH_SEQ-1 BEFORE_SEQ, SD.DISPATCH_SEQ+1 AFTER_SEQ,
@ -1007,6 +1007,7 @@
FROM Z_SFC_DISPATCH SD
INNER JOIN SHOP_ORDER SO ON SO.SITE = SD.SITE AND SO.SHOP_ORDER = SD.SHOP_ORDER
LEFT JOIN CUSTOM_FIELDS C1 ON C1.HANDLE = SO.HANDLE AND C1."ATTRIBUTE" = 'WORK_ORDER'
LEFT JOIN CUSTOM_FIELDS C2 ON C2.HANDLE = SO.HANDLE AND C2."ATTRIBUTE" = 'ITEM_NUMBER'
INNER JOIN ITEM IM ON IM.HANDLE = SO.ITEM_BO
LEFT JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE AND IT.LOCALE = 'zh'
INNER JOIN OPERATION O ON O.SITE = SD.SITE AND O.OPERATION = SD.OPERATION AND O.CURRENT_REVISION = 'true'
@ -1027,6 +1028,9 @@
<if test="workOrder != null and workOrder != ''">
AND C1.VALUE LIKE '%' ||#{workOrder}|| '%'
</if>
<if test="itemNumber != null and itemNumber != ''">
AND C2.VALUE LIKE '%' ||#{itemNumber}|| '%'
</if>
<if test="shopOrder != null and shopOrder != ''">
AND SD.SHOP_ORDER = #{shopOrder}
</if>

50
dispatch/src/main/resources/mapper/SurplusItemReturnMapper.xml
Unescape Escape View File

@ -11,16 +11,17 @@
<result column="ITEM_BO" property="itemBo" />
<result column="LENGHT" property="lenght" />
<result column="WIDTH" property="width" />
<result column="NUMBERS" property="numbers" />
<result column="QTY" property="qty" />
<result column="CREATE_USER" property="createUser" />
<result column="CREATED_DATE_TIME" property="createdDateTime" />
<result column="MODIFU_USER" property="modifuUser" />
<result column="MODIFY_USER" property="modifyUser" />
<result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
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
</sql>
<!-- BaseMapper标准查询/修改/删除 -->
@ -61,10 +62,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</where>
</select>
@ -83,10 +85,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@ -113,10 +116,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@ -143,10 +147,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@ -173,10 +178,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@ -203,10 +209,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@ -233,10 +240,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@ -259,10 +267,11 @@
<if test="itemBo!=null">ITEM_BO,</if>
<if test="lenght!=null">LENGHT,</if>
<if test="width!=null">WIDTH,</if>
<if test="numbers!=null">NUMBERS,</if>
<if test="qty!=null">QTY,</if>
<if test="createUser!=null">CREATE_USER,</if>
<if test="createdDateTime!=null">CREATED_DATE_TIME,</if>
<if test="modifuUser!=null">MODIFU_USER,</if>
<if test="modifyUser!=null">MODIFY_USER,</if>
<if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if>
</trim> VALUES
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -273,10 +282,11 @@
<if test="itemBo!=null">#{itemBo},</if>
<if test="lenght!=null">#{lenght},</if>
<if test="width!=null">#{width},</if>
<if test="numbers!=null">#{numbers},</if>
<if test="qty!=null">#{qty},</if>
<if test="createUser!=null">#{createUser},</if>
<if test="createdDateTime!=null">#{createdDateTime},</if>
<if test="modifuUser!=null">#{modifuUser},</if>
<if test="modifyUser!=null">#{modifyUser},</if>
<if test="modifiedDateTime!=null">#{modifiedDateTime},</if>
</trim>
</insert>
@ -294,10 +304,11 @@
#{itemBo},
#{lenght},
#{width},
#{numbers},
#{qty},
#{createUser},
#{createdDateTime},
#{modifuUser},
#{modifyUser},
#{modifiedDateTime},
</trim>
</insert>
@ -311,10 +322,11 @@
<if test="et.itemBo!=null">ITEM_BO=#{et.itemBo},</if>
<if test="et.lenght!=null">LENGHT=#{et.lenght},</if>
<if test="et.width!=null">WIDTH=#{et.width},</if>
<if test="et.numbers!=null">NUMBERS=#{et.numbers},</if>
<if test="et.qty!=null">QTY=#{et.qty},</if>
<if test="et.createUser!=null">CREATE_USER=#{et.createUser},</if>
<if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
<if test="et.modifuUser!=null">MODIFU_USER=#{et.modifuUser},</if>
<if test="et.modifyUser!=null">MODIFY_USER=#{et.modifyUser},</if>
<if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
</trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
</update>
@ -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},
</trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
</update>
@ -345,10 +358,11 @@
<if test="et.itemBo!=null">ITEM_BO=#{et.itemBo},</if>
<if test="et.lenght!=null">LENGHT=#{et.lenght},</if>
<if test="et.width!=null">WIDTH=#{et.width},</if>
<if test="et.numbers!=null">NUMBERS=#{et.numbers},</if>
<if test="et.qty!=null">QTY=#{et.qty},</if>
<if test="et.createUser!=null">CREATE_USER=#{et.createUser},</if>
<if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
<if test="et.modifuUser!=null">MODIFU_USER=#{et.modifuUser},</if>
<if test="et.modifyUser!=null">MODIFY_USER=#{et.modifyUser},</if>
<if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
</trim>
<where>
@ -361,10 +375,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@ -408,10 +423,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">

Write Preview
Loading…
Cancel
Save