Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
535d81cf8c
@ -710,6 +710,16 @@ public class BaseKnifeController extends BaseController
|
||||
for (int j = 0; j < outPlanDetail.getPlannedQuantity(); j++) {
|
||||
WmsOutPlanDetailEntity wmsOutPlanDetailEntity = new WmsOutPlanDetailEntity();
|
||||
wmsOutPlanDetailEntity.setBaseKnifeId(baseKnifeListOutPlan.get(i++).getBaseKnifeId());
|
||||
wmsOutPlanDetailEntity.setAreaCode(baseKnifeListOutPlan.get(i++).getAreaCode());
|
||||
wmsOutPlanDetailEntity.setItemOrProduct(baseKnifeListOutPlan.get(i++).getItemOrProduct());
|
||||
wmsOutPlanDetailEntity.setKnifeCode(baseKnifeListOutPlan.get(i++).getKnifeCode());
|
||||
wmsOutPlanDetailEntity.setKnifeName(baseKnifeListOutPlan.get(i++).getKnifeName());
|
||||
wmsOutPlanDetailEntity.setPlanSheet(baseKnifeListOutPlan.get(i++).getPlanSheet());
|
||||
wmsOutPlanDetailEntity.setKnifeLife(baseKnifeListOutPlan.get(i++).getKnifeLife());
|
||||
wmsOutPlanDetailEntity.setResetCount(baseKnifeListOutPlan.get(i++).getResetCount());
|
||||
wmsOutPlanDetailEntity.setKnifeUnit(baseKnifeListOutPlan.get(i++).getKnifeUnit());
|
||||
wmsOutPlanDetailEntity.setSafeStock(baseKnifeListOutPlan.get(i++).getKnifeType());
|
||||
wmsOutPlanDetailEntity.setStandardQuantity(baseKnifeListOutPlan.get(i++).getStandardQuantity());
|
||||
wmsOutPlanDetailEntity.setWmsOutPlanDetailId(outPlanDetail.getWmsOutPlanDetailId());
|
||||
wmsOutPlanDetailEntity.setCreateBy(getUsername());
|
||||
wmsOutPlanDetailEntity.setCreateTime(DateUtils.getNowDate());
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
package com.ktg.mes.md.domain;
|
||||
|
||||
import com.ktg.common.annotation.Excel;
|
||||
import com.ktg.common.core.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ktg.common.annotation.Excel;
|
||||
import com.ktg.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 出库计划明细实体对象 WMS_OUT_PLAN_DETAIL_ENTITY
|
||||
*
|
||||
* @author yinjinlu
|
||||
* @date 2024-11-01
|
||||
* @date 2024-11-11
|
||||
*/
|
||||
public class WmsOutPlanDetailEntity extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
@ -20,15 +20,15 @@ public class WmsOutPlanDetailEntity extends BaseEntity {
|
||||
private Long wmsOutPlanDetailEntityId;
|
||||
|
||||
/**
|
||||
* 出库计划明细
|
||||
* 所属出库计划明细
|
||||
*/
|
||||
@Excel(name = "出库计划明细")
|
||||
@Excel(name = "所属出库计划明细")
|
||||
private Long wmsOutPlanDetailId;
|
||||
|
||||
/**
|
||||
* 工具台账
|
||||
* 所属工具台账
|
||||
*/
|
||||
@Excel(name = "工具台账")
|
||||
@Excel(name = "所属工具台账")
|
||||
private Long baseKnifeId;
|
||||
|
||||
/**
|
||||
@ -51,62 +51,202 @@ public class WmsOutPlanDetailEntity extends BaseEntity {
|
||||
*/
|
||||
private Integer attr4;
|
||||
|
||||
public Long getWmsOutPlanDetailEntityId() {
|
||||
return wmsOutPlanDetailEntityId;
|
||||
}
|
||||
/**
|
||||
* 库位编码
|
||||
*/
|
||||
@Excel(name = "库位编码")
|
||||
private String areaCode;
|
||||
|
||||
/**
|
||||
* 物料或整刀
|
||||
*/
|
||||
@Excel(name = "物料或整刀")
|
||||
private String itemOrProduct;
|
||||
|
||||
/**
|
||||
* 工具编码
|
||||
*/
|
||||
@Excel(name = "工具编码")
|
||||
private String knifeCode;
|
||||
|
||||
/**
|
||||
* 工具名称
|
||||
*/
|
||||
@Excel(name = "工具名称")
|
||||
private String knifeName;
|
||||
|
||||
/**
|
||||
* 归属计划单
|
||||
*/
|
||||
@Excel(name = "归属计划单")
|
||||
private String planSheet;
|
||||
|
||||
/**
|
||||
* 工具寿命
|
||||
*/
|
||||
@Excel(name = "工具寿命")
|
||||
private Integer knifeLife;
|
||||
|
||||
/**
|
||||
* 重置次数
|
||||
*/
|
||||
@Excel(name = "重置次数")
|
||||
private Integer resetCount;
|
||||
|
||||
/**
|
||||
* 计量单位
|
||||
*/
|
||||
@Excel(name = "计量单位")
|
||||
private String knifeUnit;
|
||||
|
||||
/**
|
||||
* 安全库存
|
||||
*/
|
||||
@Excel(name = "安全库存")
|
||||
private String safeStock;
|
||||
|
||||
/**
|
||||
* 标准数量
|
||||
*/
|
||||
@Excel(name = "标准数量")
|
||||
private String standardQuantity;
|
||||
|
||||
public void setWmsOutPlanDetailEntityId(Long wmsOutPlanDetailEntityId) {
|
||||
this.wmsOutPlanDetailEntityId = wmsOutPlanDetailEntityId;
|
||||
}
|
||||
|
||||
public Long getWmsOutPlanDetailId() {
|
||||
return wmsOutPlanDetailId;
|
||||
public Long getWmsOutPlanDetailEntityId() {
|
||||
return wmsOutPlanDetailEntityId;
|
||||
}
|
||||
|
||||
public void setWmsOutPlanDetailId(Long wmsOutPlanDetailId) {
|
||||
this.wmsOutPlanDetailId = wmsOutPlanDetailId;
|
||||
}
|
||||
|
||||
public Long getBaseKnifeId() {
|
||||
return baseKnifeId;
|
||||
public Long getWmsOutPlanDetailId() {
|
||||
return wmsOutPlanDetailId;
|
||||
}
|
||||
|
||||
public void setBaseKnifeId(Long baseKnifeId) {
|
||||
this.baseKnifeId = baseKnifeId;
|
||||
}
|
||||
|
||||
public String getAttr1() {
|
||||
return attr1;
|
||||
public Long getBaseKnifeId() {
|
||||
return baseKnifeId;
|
||||
}
|
||||
|
||||
public void setAttr1(String attr1) {
|
||||
this.attr1 = attr1;
|
||||
}
|
||||
|
||||
public String getAttr2() {
|
||||
return attr2;
|
||||
public String getAttr1() {
|
||||
return attr1;
|
||||
}
|
||||
|
||||
public void setAttr2(String attr2) {
|
||||
this.attr2 = attr2;
|
||||
}
|
||||
|
||||
public Integer getAttr3() {
|
||||
return attr3;
|
||||
public String getAttr2() {
|
||||
return attr2;
|
||||
}
|
||||
|
||||
public void setAttr3(Integer attr3) {
|
||||
this.attr3 = attr3;
|
||||
}
|
||||
|
||||
public Integer getAttr4() {
|
||||
return attr4;
|
||||
public Integer getAttr3() {
|
||||
return attr3;
|
||||
}
|
||||
|
||||
public void setAttr4(Integer attr4) {
|
||||
this.attr4 = attr4;
|
||||
}
|
||||
|
||||
public Integer getAttr4() {
|
||||
return attr4;
|
||||
}
|
||||
|
||||
public void setAreaCode(String areaCode) {
|
||||
this.areaCode = areaCode;
|
||||
}
|
||||
|
||||
public String getAreaCode() {
|
||||
return areaCode;
|
||||
}
|
||||
|
||||
public void setItemOrProduct(String itemOrProduct) {
|
||||
this.itemOrProduct = itemOrProduct;
|
||||
}
|
||||
|
||||
public String getItemOrProduct() {
|
||||
return itemOrProduct;
|
||||
}
|
||||
|
||||
public void setKnifeCode(String knifeCode) {
|
||||
this.knifeCode = knifeCode;
|
||||
}
|
||||
|
||||
public String getKnifeCode() {
|
||||
return knifeCode;
|
||||
}
|
||||
|
||||
public void setKnifeName(String knifeName) {
|
||||
this.knifeName = knifeName;
|
||||
}
|
||||
|
||||
public String getKnifeName() {
|
||||
return knifeName;
|
||||
}
|
||||
|
||||
public void setPlanSheet(String planSheet) {
|
||||
this.planSheet = planSheet;
|
||||
}
|
||||
|
||||
public String getPlanSheet() {
|
||||
return planSheet;
|
||||
}
|
||||
|
||||
public void setKnifeLife(Integer knifeLife) {
|
||||
this.knifeLife = knifeLife;
|
||||
}
|
||||
|
||||
public Integer getKnifeLife() {
|
||||
return knifeLife;
|
||||
}
|
||||
|
||||
public void setResetCount(Integer resetCount) {
|
||||
this.resetCount = resetCount;
|
||||
}
|
||||
|
||||
public Integer getResetCount() {
|
||||
return resetCount;
|
||||
}
|
||||
|
||||
public void setKnifeUnit(String knifeUnit) {
|
||||
this.knifeUnit = knifeUnit;
|
||||
}
|
||||
|
||||
public String getKnifeUnit() {
|
||||
return knifeUnit;
|
||||
}
|
||||
|
||||
public void setSafeStock(String safeStock) {
|
||||
this.safeStock = safeStock;
|
||||
}
|
||||
|
||||
public String getSafeStock() {
|
||||
return safeStock;
|
||||
}
|
||||
|
||||
public void setStandardQuantity(String standardQuantity) {
|
||||
this.standardQuantity = standardQuantity;
|
||||
}
|
||||
|
||||
public String getStandardQuantity() {
|
||||
return standardQuantity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
|
||||
@ -122,6 +262,16 @@ public class WmsOutPlanDetailEntity extends BaseEntity {
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("areaCode", getAreaCode())
|
||||
.append("itemOrProduct", getItemOrProduct())
|
||||
.append("knifeCode", getKnifeCode())
|
||||
.append("knifeName", getKnifeName())
|
||||
.append("planSheet", getPlanSheet())
|
||||
.append("knifeLife", getKnifeLife())
|
||||
.append("resetCount", getResetCount())
|
||||
.append("knifeUnit", getKnifeUnit())
|
||||
.append("safeStock", getSafeStock())
|
||||
.append("standardQuantity", getStandardQuantity())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,14 +1,14 @@
|
||||
package com.ktg.mes.md.mapper;
|
||||
|
||||
import com.ktg.mes.md.domain.WmsOutPlanDetailEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.ktg.mes.md.domain.WmsOutPlanDetailEntity;
|
||||
|
||||
/**
|
||||
* 出库计划明细实体Mapper接口
|
||||
*
|
||||
* @author yinjinlu
|
||||
* @date 2024-11-01
|
||||
* @date 2024-11-11
|
||||
*/
|
||||
public interface WmsOutPlanDetailEntityMapper {
|
||||
/**
|
||||
@ -17,7 +17,7 @@ public interface WmsOutPlanDetailEntityMapper {
|
||||
* @param wmsOutPlanDetailEntityId 出库计划明细实体主键
|
||||
* @return 出库计划明细实体
|
||||
*/
|
||||
WmsOutPlanDetailEntity selectWmsOutPlanDetailEntityByWmsOutPlanDetailEntityId(Long wmsOutPlanDetailEntityId);
|
||||
public WmsOutPlanDetailEntity selectWmsOutPlanDetailEntityByWmsOutPlanDetailEntityId(Long wmsOutPlanDetailEntityId);
|
||||
|
||||
/**
|
||||
* 查询出库计划明细实体列表
|
||||
@ -25,7 +25,7 @@ public interface WmsOutPlanDetailEntityMapper {
|
||||
* @param wmsOutPlanDetailEntity 出库计划明细实体
|
||||
* @return 出库计划明细实体集合
|
||||
*/
|
||||
List<WmsOutPlanDetailEntity> selectWmsOutPlanDetailEntityList(WmsOutPlanDetailEntity wmsOutPlanDetailEntity);
|
||||
public List<WmsOutPlanDetailEntity> selectWmsOutPlanDetailEntityList(WmsOutPlanDetailEntity wmsOutPlanDetailEntity);
|
||||
|
||||
/**
|
||||
* 新增出库计划明细实体
|
||||
@ -33,7 +33,7 @@ public interface WmsOutPlanDetailEntityMapper {
|
||||
* @param wmsOutPlanDetailEntity 出库计划明细实体
|
||||
* @return 结果
|
||||
*/
|
||||
int insertWmsOutPlanDetailEntity(WmsOutPlanDetailEntity wmsOutPlanDetailEntity);
|
||||
public int insertWmsOutPlanDetailEntity(WmsOutPlanDetailEntity wmsOutPlanDetailEntity);
|
||||
|
||||
/**
|
||||
* 修改出库计划明细实体
|
||||
@ -41,7 +41,7 @@ public interface WmsOutPlanDetailEntityMapper {
|
||||
* @param wmsOutPlanDetailEntity 出库计划明细实体
|
||||
* @return 结果
|
||||
*/
|
||||
int updateWmsOutPlanDetailEntity(WmsOutPlanDetailEntity wmsOutPlanDetailEntity);
|
||||
public int updateWmsOutPlanDetailEntity(WmsOutPlanDetailEntity wmsOutPlanDetailEntity);
|
||||
|
||||
/**
|
||||
* 删除出库计划明细实体
|
||||
@ -49,7 +49,7 @@ public interface WmsOutPlanDetailEntityMapper {
|
||||
* @param wmsOutPlanDetailEntityId 出库计划明细实体主键
|
||||
* @return 结果
|
||||
*/
|
||||
int deleteWmsOutPlanDetailEntityByWmsOutPlanDetailEntityId(Long wmsOutPlanDetailEntityId);
|
||||
public int deleteWmsOutPlanDetailEntityByWmsOutPlanDetailEntityId(Long wmsOutPlanDetailEntityId);
|
||||
|
||||
/**
|
||||
* 批量删除出库计划明细实体
|
||||
@ -57,5 +57,5 @@ public interface WmsOutPlanDetailEntityMapper {
|
||||
* @param wmsOutPlanDetailEntityIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
int deleteWmsOutPlanDetailEntityByWmsOutPlanDetailEntityIds(Long[] wmsOutPlanDetailEntityIds);
|
||||
}
|
||||
public int deleteWmsOutPlanDetailEntityByWmsOutPlanDetailEntityIds(Long[] wmsOutPlanDetailEntityIds);
|
||||
}
|
||||
@ -158,6 +158,16 @@ public class WmsOutPlanServiceImpl implements IWmsOutPlanService {
|
||||
WmsOutPlanDetailEntity wmsOutPlanDetailEntity = new WmsOutPlanDetailEntity();
|
||||
wmsOutPlanDetailEntity.setWmsOutPlanDetailId(wmsOutPlanDetail.getWmsOutPlanDetailId());
|
||||
wmsOutPlanDetailEntity.setBaseKnifeId(baseKnife.getBaseKnifeId());
|
||||
wmsOutPlanDetailEntity.setAreaCode(baseKnife.getAreaCode());
|
||||
wmsOutPlanDetailEntity.setItemOrProduct(baseKnife.getItemOrProduct());
|
||||
wmsOutPlanDetailEntity.setKnifeCode(baseKnife.getKnifeCode());
|
||||
wmsOutPlanDetailEntity.setKnifeName(baseKnife.getKnifeName());
|
||||
wmsOutPlanDetailEntity.setPlanSheet(baseKnife.getPlanSheet());
|
||||
wmsOutPlanDetailEntity.setKnifeLife(baseKnife.getKnifeLife());
|
||||
wmsOutPlanDetailEntity.setResetCount(baseKnife.getResetCount());
|
||||
wmsOutPlanDetailEntity.setKnifeUnit(baseKnife.getKnifeUnit());
|
||||
wmsOutPlanDetailEntity.setSafeStock(baseKnife.getKnifeType());
|
||||
wmsOutPlanDetailEntity.setStandardQuantity(baseKnife.getStandardQuantity());
|
||||
|
||||
// 插入出库计划明细实体
|
||||
this.wmsOutPlanDetailEntityMapper.insertWmsOutPlanDetailEntity(wmsOutPlanDetailEntity);
|
||||
@ -325,6 +335,16 @@ public class WmsOutPlanServiceImpl implements IWmsOutPlanService {
|
||||
WmsOutPlanDetailEntity wmsOutPlanDetailEntity = new WmsOutPlanDetailEntity();
|
||||
wmsOutPlanDetailEntity.setWmsOutPlanDetailId(wmsOutPlanDetail.getWmsOutPlanDetailId());
|
||||
wmsOutPlanDetailEntity.setBaseKnifeId(baseKnife.getBaseKnifeId());
|
||||
wmsOutPlanDetailEntity.setAreaCode(baseKnife.getAreaCode());
|
||||
wmsOutPlanDetailEntity.setItemOrProduct(baseKnife.getItemOrProduct());
|
||||
wmsOutPlanDetailEntity.setKnifeCode(baseKnife.getKnifeCode());
|
||||
wmsOutPlanDetailEntity.setKnifeName(baseKnife.getKnifeName());
|
||||
wmsOutPlanDetailEntity.setPlanSheet(baseKnife.getPlanSheet());
|
||||
wmsOutPlanDetailEntity.setKnifeLife(baseKnife.getKnifeLife());
|
||||
wmsOutPlanDetailEntity.setResetCount(baseKnife.getResetCount());
|
||||
wmsOutPlanDetailEntity.setKnifeUnit(baseKnife.getKnifeUnit());
|
||||
wmsOutPlanDetailEntity.setSafeStock(baseKnife.getKnifeType());
|
||||
wmsOutPlanDetailEntity.setStandardQuantity(baseKnife.getStandardQuantity());
|
||||
wmsOutPlanDetailEntity.setRemark("一键清退无寿命物品");
|
||||
wmsOutPlanDetailEntity.setCreateBy(username);
|
||||
wmsOutPlanDetailEntity.setCreateTime(new Date());
|
||||
|
||||
@ -97,6 +97,8 @@ public class WmsOutTaskServiceImpl implements IWmsOutTaskService {
|
||||
outTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(nowWmsOutPlanDetailEntity.getCreateTime());
|
||||
hashMap.put("outTime", outTime); // 出库时间
|
||||
hashMap.put("baseKnifeId", nowWmsOutPlanDetailEntity.getBaseKnifeId());
|
||||
hashMap.put("knifeLife", nowWmsOutPlanDetailEntity.getKnifeLife());
|
||||
hashMap.put("resetCount", nowWmsOutPlanDetailEntity.getResetCount());
|
||||
hashMapList.add(hashMap);
|
||||
|
||||
// 注入出库信息对象
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ktg.mes.md.mapper.WmsOutPlanDetailEntityMapper">
|
||||
|
||||
<resultMap type="WmsOutPlanDetailEntity" id="WmsOutPlanDetailEntityResult">
|
||||
<result property="wmsOutPlanDetailEntityId" column="WMS_OUT_PLAN_DETAIL_ENTITY_ID"/>
|
||||
<result property="wmsOutPlanDetailId" column="WMS_OUT_PLAN_DETAIL_ID"/>
|
||||
@ -16,6 +17,16 @@
|
||||
<result property="createTime" column="CREATE_TIME"/>
|
||||
<result property="updateBy" column="UPDATE_BY"/>
|
||||
<result property="updateTime" column="UPDATE_TIME"/>
|
||||
<result property="areaCode" column="AREA_CODE"/>
|
||||
<result property="itemOrProduct" column="ITEM_OR_PRODUCT"/>
|
||||
<result property="knifeCode" column="KNIFE_CODE"/>
|
||||
<result property="knifeName" column="KNIFE_NAME"/>
|
||||
<result property="planSheet" column="PLAN_SHEET"/>
|
||||
<result property="knifeLife" column="KNIFE_LIFE"/>
|
||||
<result property="resetCount" column="RESET_COUNT"/>
|
||||
<result property="knifeUnit" column="KNIFE_UNIT"/>
|
||||
<result property="safeStock" column="SAFE_STOCK"/>
|
||||
<result property="standardQuantity" column="STANDARD_QUANTITY"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectWmsOutPlanDetailEntityVo">
|
||||
@ -30,7 +41,17 @@
|
||||
CREATE_BY,
|
||||
CREATE_TIME,
|
||||
UPDATE_BY,
|
||||
UPDATE_TIME
|
||||
UPDATE_TIME,
|
||||
AREA_CODE,
|
||||
ITEM_OR_PRODUCT,
|
||||
KNIFE_CODE,
|
||||
KNIFE_NAME,
|
||||
PLAN_SHEET,
|
||||
KNIFE_LIFE,
|
||||
RESET_COUNT,
|
||||
KNIFE_UNIT,
|
||||
SAFE_STOCK,
|
||||
STANDARD_QUANTITY
|
||||
from WMS_OUT_PLAN_DETAIL_ENTITY
|
||||
</sql>
|
||||
|
||||
@ -38,26 +59,24 @@
|
||||
resultMap="WmsOutPlanDetailEntityResult">
|
||||
<include refid="selectWmsOutPlanDetailEntityVo"/>
|
||||
<where>
|
||||
<if test="wmsOutPlanDetailId != null">
|
||||
and WMS_OUT_PLAN_DETAIL_ID = #{wmsOutPlanDetailId}
|
||||
</if>
|
||||
<if test="baseKnifeId != null">
|
||||
and BASE_KNIFE_ID = #{baseKnifeId}
|
||||
</if>
|
||||
<if test="remark != null and remark != ''">
|
||||
and REMARK like concat('%', #{remark}, '%')
|
||||
</if>
|
||||
<if test="createBy != null and createBy != ''">
|
||||
and CREATE_BY = #{createBy}
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
and CREATE_TIME = #{createTime}
|
||||
</if>
|
||||
<if test="updateBy != null and updateBy != ''">
|
||||
and UPDATE_BY = #{updateBy}
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
and UPDATE_TIME = #{updateTime}
|
||||
<if test="wmsOutPlanDetailId != null ">and WMS_OUT_PLAN_DETAIL_ID = #{wmsOutPlanDetailId}</if>
|
||||
<if test="baseKnifeId != null ">and BASE_KNIFE_ID = #{baseKnifeId}</if>
|
||||
<if test="remark != null and remark != ''">and REMARK like concat('%', #{remark}, '%')</if>
|
||||
<if test="createBy != null and createBy != ''">and CREATE_BY = #{createBy}</if>
|
||||
<if test="createTime != null ">and CREATE_TIME = #{createTime}</if>
|
||||
<if test="updateBy != null and updateBy != ''">and UPDATE_BY = #{updateBy}</if>
|
||||
<if test="updateTime != null ">and UPDATE_TIME = #{updateTime}</if>
|
||||
<if test="areaCode != null and areaCode != ''">and AREA_CODE = #{areaCode}</if>
|
||||
<if test="itemOrProduct != null and itemOrProduct != ''">and ITEM_OR_PRODUCT = #{itemOrProduct}</if>
|
||||
<if test="knifeCode != null and knifeCode != ''">and KNIFE_CODE = #{knifeCode}</if>
|
||||
<if test="knifeName != null and knifeName != ''">and KNIFE_NAME = #{knifeName}</if>
|
||||
<if test="planSheet != null and planSheet != ''">and PLAN_SHEET = #{planSheet}</if>
|
||||
<if test="knifeLife != null ">and KNIFE_LIFE = #{knifeLife}</if>
|
||||
<if test="resetCount != null ">and RESET_COUNT = #{resetCount}</if>
|
||||
<if test="knifeUnit != null and knifeUnit != ''">and KNIFE_UNIT = #{knifeUnit}</if>
|
||||
<if test="safeStock != null and safeStock != ''">and SAFE_STOCK = #{safeStock}</if>
|
||||
<if test="standardQuantity != null and standardQuantity != ''">and STANDARD_QUANTITY =
|
||||
#{standardQuantity}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
@ -72,113 +91,77 @@
|
||||
keyProperty="wmsOutPlanDetailEntityId">
|
||||
insert into WMS_OUT_PLAN_DETAIL_ENTITY
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="wmsOutPlanDetailId != null">
|
||||
WMS_OUT_PLAN_DETAIL_ID,
|
||||
</if>
|
||||
<if test="baseKnifeId != null">
|
||||
BASE_KNIFE_ID,
|
||||
</if>
|
||||
<if test="remark != null">
|
||||
REMARK,
|
||||
</if>
|
||||
<if test="attr1 != null">
|
||||
ATTR1,
|
||||
</if>
|
||||
<if test="attr2 != null">
|
||||
ATTR2,
|
||||
</if>
|
||||
<if test="attr3 != null">
|
||||
ATTR3,
|
||||
</if>
|
||||
<if test="attr4 != null">
|
||||
ATTR4,
|
||||
</if>
|
||||
<if test="createBy != null">
|
||||
CREATE_BY,
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
CREATE_TIME,
|
||||
</if>
|
||||
<if test="updateBy != null">
|
||||
UPDATE_BY,
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
UPDATE_TIME,
|
||||
</if>
|
||||
<if test="wmsOutPlanDetailId != null">WMS_OUT_PLAN_DETAIL_ID,</if>
|
||||
<if test="baseKnifeId != null">BASE_KNIFE_ID,</if>
|
||||
<if test="remark != null">REMARK,</if>
|
||||
<if test="attr1 != null">ATTR1,</if>
|
||||
<if test="attr2 != null">ATTR2,</if>
|
||||
<if test="attr3 != null">ATTR3,</if>
|
||||
<if test="attr4 != null">ATTR4,</if>
|
||||
<if test="createBy != null">CREATE_BY,</if>
|
||||
<if test="createTime != null">CREATE_TIME,</if>
|
||||
<if test="updateBy != null">UPDATE_BY,</if>
|
||||
<if test="updateTime != null">UPDATE_TIME,</if>
|
||||
<if test="areaCode != null">AREA_CODE,</if>
|
||||
<if test="itemOrProduct != null">ITEM_OR_PRODUCT,</if>
|
||||
<if test="knifeCode != null">KNIFE_CODE,</if>
|
||||
<if test="knifeName != null">KNIFE_NAME,</if>
|
||||
<if test="planSheet != null">PLAN_SHEET,</if>
|
||||
<if test="knifeLife != null">KNIFE_LIFE,</if>
|
||||
<if test="resetCount != null">RESET_COUNT,</if>
|
||||
<if test="knifeUnit != null">KNIFE_UNIT,</if>
|
||||
<if test="safeStock != null">SAFE_STOCK,</if>
|
||||
<if test="standardQuantity != null">STANDARD_QUANTITY,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="wmsOutPlanDetailId != null">
|
||||
#{wmsOutPlanDetailId},
|
||||
</if>
|
||||
<if test="baseKnifeId != null">
|
||||
#{baseKnifeId},
|
||||
</if>
|
||||
<if test="remark != null">
|
||||
#{remark},
|
||||
</if>
|
||||
<if test="attr1 != null">
|
||||
#{attr1},
|
||||
</if>
|
||||
<if test="attr2 != null">
|
||||
#{attr2},
|
||||
</if>
|
||||
<if test="attr3 != null">
|
||||
#{attr3},
|
||||
</if>
|
||||
<if test="attr4 != null">
|
||||
#{attr4},
|
||||
</if>
|
||||
<if test="createBy != null">
|
||||
#{createBy},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
#{createTime},
|
||||
</if>
|
||||
<if test="updateBy != null">
|
||||
#{updateBy},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
#{updateTime},
|
||||
</if>
|
||||
<if test="wmsOutPlanDetailId != null">#{wmsOutPlanDetailId},</if>
|
||||
<if test="baseKnifeId != null">#{baseKnifeId},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="attr1 != null">#{attr1},</if>
|
||||
<if test="attr2 != null">#{attr2},</if>
|
||||
<if test="attr3 != null">#{attr3},</if>
|
||||
<if test="attr4 != null">#{attr4},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="areaCode != null">#{areaCode},</if>
|
||||
<if test="itemOrProduct != null">#{itemOrProduct},</if>
|
||||
<if test="knifeCode != null">#{knifeCode},</if>
|
||||
<if test="knifeName != null">#{knifeName},</if>
|
||||
<if test="planSheet != null">#{planSheet},</if>
|
||||
<if test="knifeLife != null">#{knifeLife},</if>
|
||||
<if test="resetCount != null">#{resetCount},</if>
|
||||
<if test="knifeUnit != null">#{knifeUnit},</if>
|
||||
<if test="safeStock != null">#{safeStock},</if>
|
||||
<if test="standardQuantity != null">#{standardQuantity},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateWmsOutPlanDetailEntity" parameterType="WmsOutPlanDetailEntity">
|
||||
update WMS_OUT_PLAN_DETAIL_ENTITY
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="wmsOutPlanDetailId != null">
|
||||
WMS_OUT_PLAN_DETAIL_ID = #{wmsOutPlanDetailId},
|
||||
</if>
|
||||
<if test="baseKnifeId != null">
|
||||
BASE_KNIFE_ID = #{baseKnifeId},
|
||||
</if>
|
||||
<if test="remark != null">
|
||||
REMARK = #{remark},
|
||||
</if>
|
||||
<if test="attr1 != null">
|
||||
ATTR1 = #{attr1},
|
||||
</if>
|
||||
<if test="attr2 != null">
|
||||
ATTR2 = #{attr2},
|
||||
</if>
|
||||
<if test="attr3 != null">
|
||||
ATTR3 = #{attr3},
|
||||
</if>
|
||||
<if test="attr4 != null">
|
||||
ATTR4 = #{attr4},
|
||||
</if>
|
||||
<if test="createBy != null">
|
||||
CREATE_BY = #{createBy},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
CREATE_TIME = #{createTime},
|
||||
</if>
|
||||
<if test="updateBy != null">
|
||||
UPDATE_BY = #{updateBy},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
UPDATE_TIME = #{updateTime},
|
||||
</if>
|
||||
<if test="wmsOutPlanDetailId != null">WMS_OUT_PLAN_DETAIL_ID = #{wmsOutPlanDetailId},</if>
|
||||
<if test="baseKnifeId != null">BASE_KNIFE_ID = #{baseKnifeId},</if>
|
||||
<if test="remark != null">REMARK = #{remark},</if>
|
||||
<if test="attr1 != null">ATTR1 = #{attr1},</if>
|
||||
<if test="attr2 != null">ATTR2 = #{attr2},</if>
|
||||
<if test="attr3 != null">ATTR3 = #{attr3},</if>
|
||||
<if test="attr4 != null">ATTR4 = #{attr4},</if>
|
||||
<if test="createBy != null">CREATE_BY = #{createBy},</if>
|
||||
<if test="createTime != null">CREATE_TIME = #{createTime},</if>
|
||||
<if test="updateBy != null">UPDATE_BY = #{updateBy},</if>
|
||||
<if test="updateTime != null">UPDATE_TIME = #{updateTime},</if>
|
||||
<if test="areaCode != null">AREA_CODE = #{areaCode},</if>
|
||||
<if test="itemOrProduct != null">ITEM_OR_PRODUCT = #{itemOrProduct},</if>
|
||||
<if test="knifeCode != null">KNIFE_CODE = #{knifeCode},</if>
|
||||
<if test="knifeName != null">KNIFE_NAME = #{knifeName},</if>
|
||||
<if test="planSheet != null">PLAN_SHEET = #{planSheet},</if>
|
||||
<if test="knifeLife != null">KNIFE_LIFE = #{knifeLife},</if>
|
||||
<if test="resetCount != null">RESET_COUNT = #{resetCount},</if>
|
||||
<if test="knifeUnit != null">KNIFE_UNIT = #{knifeUnit},</if>
|
||||
<if test="safeStock != null">SAFE_STOCK = #{safeStock},</if>
|
||||
<if test="standardQuantity != null">STANDARD_QUANTITY = #{standardQuantity},</if>
|
||||
</trim>
|
||||
where WMS_OUT_PLAN_DETAIL_ENTITY_ID = #{wmsOutPlanDetailEntityId}
|
||||
</update>
|
||||
@ -190,8 +173,7 @@
|
||||
</delete>
|
||||
|
||||
<delete id="deleteWmsOutPlanDetailEntityByWmsOutPlanDetailEntityIds" parameterType="String">
|
||||
delete
|
||||
from WMS_OUT_PLAN_DETAIL_ENTITY where WMS_OUT_PLAN_DETAIL_ENTITY_ID in
|
||||
delete from WMS_OUT_PLAN_DETAIL_ENTITY where WMS_OUT_PLAN_DETAIL_ENTITY_ID in
|
||||
<foreach item="wmsOutPlanDetailEntityId" collection="array" open="(" separator="," close=")">
|
||||
#{wmsOutPlanDetailEntityId}
|
||||
</foreach>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user