mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：销售出库、销售退货、转移调拨、装箱管理、SN码、外协发料、外协入库、工艺流程和检测模板的单位名称问题解决

Browse Source
This commit is contained in:
zhangxuanming 2025-02-08 16:36:14 +08:00
parent 4f9750c324
commit 24c5ebb366
24 changed files with 230 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java
View File

@ -228,6 +228,7 @@ public class ProWorkorderController extends BaseController
theBom.setBomItemCode(bom.getItemCode());
theBom.setItemOrProduct(bom.getItemOrProduct());
theBom.setUnitOfMeasure(bom.getUnitOfMeasure());
theBom.setUnitName(bom.getUnitName());
theBom.setBomItemSpec(bom.getItemSpc());
theBom.setQuantity(bom.getQuantity());
result.addAll(getBoms(theBom,bom.getQuantity(),0));

13
ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProCard.java
View File

@ -62,6 +62,9 @@ public class ProCard extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 赋码地址 */
@Excel(name = "赋码地址")
private String barcodeUrl;
@ -97,8 +100,15 @@ public class ProCard extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd")
private Date inputTime;
public String getUnitName() {
return unitName;
}
public void setCardId(Long cardId)
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setCardId(Long cardId)
{
this.cardId = cardId;
}
@ -291,6 +301,7 @@ public class ProCard extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("barcodeUrl", getBarcodeUrl())
.append("quantityTransfered", getQuantityTransfered())
.append("status", getStatus())

14
ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProRouteProduct.java
View File

@ -43,6 +43,9 @@ public class ProRouteProduct extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 生产数量 */
@Excel(name = "生产数量")
private Long quantity;
@ -67,7 +70,15 @@ public class ProRouteProduct extends BaseEntity
/** 预留字段4 */
private Long attr4;
public void setRecordId(Long recordId)
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setRecordId(Long recordId)
{
this.recordId = recordId;
}
@ -204,6 +215,7 @@ public class ProRouteProduct extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantity", getQuantity())
.append("productionTime", getProductionTime())
.append("timeUnitType", getTimeUnitType())

14
ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java
View File

@ -63,6 +63,9 @@ public class ProWorkorder extends TreeEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 批次号 */
@Excel(name = "批次号")
private String batchCode;
@ -136,7 +139,15 @@ public class ProWorkorder extends TreeEntity
private List<ProTask> tasks;
public void setWorkorderId(Long workorderId)
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setWorkorderId(Long workorderId)
{
this.workorderId = workorderId;
}
@ -416,6 +427,7 @@ public class ProWorkorder extends TreeEntity
", productName='" + productName + '\'' +
", productSpc='" + productSpc + '\'' +
", unitOfMeasure='" + unitOfMeasure + '\'' +
", unitName='" + unitName + '\'' +
", batchCode='" + batchCode + '\'' +
", quantity=" + quantity +
", quantityProduced=" + quantityProduced +

14
ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorderBom.java
View File

@ -43,6 +43,9 @@ public class ProWorkorderBom extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 物料产品标识 */
@Excel(name = "物料产品标识")
private String itemOrProduct;
@ -63,7 +66,15 @@ public class ProWorkorderBom extends BaseEntity
/** 预留字段4 */
private Long attr4;
public void setLineId(Long lineId)
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
}
@ -191,6 +202,7 @@ public class ProWorkorderBom extends BaseEntity
.append("itemName", getItemName())
.append("itemSpc", getItemSpc())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("itemOrProduct", getItemOrProduct())
.append("quantity", getQuantity())
.append("remark", getRemark())

14
ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcTemplateProduct.java
View File

@ -43,6 +43,9 @@ public class QcTemplateProduct extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 最低检测数 */
@Excel(name = "最低检测数")
private Long quantityCheck;
@ -75,7 +78,15 @@ public class QcTemplateProduct extends BaseEntity
/** 预留字段4 */
private Long attr4;
public void setRecordId(Long recordId)
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setRecordId(Long recordId)
{
this.recordId = recordId;
}
@ -230,6 +241,7 @@ public class QcTemplateProduct extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantityCheck", getQuantityCheck())
.append("quantityUnqualified", getQuantityUnqualified())
.append("crRate", getCrRate())

14
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceIssueLine.java
View File

@ -47,6 +47,9 @@ public class WmOutsourceIssueLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 领料数量 */
@Excel(name = "领料数量")
private BigDecimal quantityIssued;
@ -103,7 +106,15 @@ public class WmOutsourceIssueLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public void setLineId(Long lineId)
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
}
@ -322,6 +333,7 @@ public class WmOutsourceIssueLine extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantityIssued", getQuantityIssued())
.append("batchCode", getBatchCode())
.append("warehouseId", getWarehouseId())

14
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceRecptLine.java
View File

@ -45,6 +45,9 @@ public class WmOutsourceRecptLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 入库数量 */
@Excel(name = "入库数量")
private BigDecimal quantityRecived;
@ -118,7 +121,15 @@ public class WmOutsourceRecptLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public void setLineId(Long lineId)
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
}
@ -363,6 +374,7 @@ public class WmOutsourceRecptLine extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantityRecived", getQuantityRecived())
.append("batchCode", getBatchCode())
.append("warehouseId", getWarehouseId())

14
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmPackageLine.java
View File

@ -49,6 +49,9 @@ public class WmPackageLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 装箱数量 */
@Excel(name = "装箱数量")
private BigDecimal quantityPackage;
@ -118,7 +121,15 @@ public class WmPackageLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public void setLineId(Long lineId)
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
}
@ -364,6 +375,7 @@ public class WmPackageLine extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantityPackage", getQuantityPackage())
.append("workorderId", getWorkorderId())
.append("workorderCode", getWorkorderCode())

14
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductSalseLine.java
View File

@ -47,6 +47,9 @@ public class WmProductSalseLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 出库数量 */
@Excel(name = "出库数量")
private BigDecimal quantitySalse;
@ -118,7 +121,15 @@ public class WmProductSalseLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public void setLineId(Long lineId)
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
}
@ -362,6 +373,7 @@ public class WmProductSalseLine extends BaseEntity
", itemName='" + itemName + '\'' +
", specification='" + specification + '\'' +
", unitOfMeasure='" + unitOfMeasure + '\'' +
", unitName='" + unitName + '\'' +
", quantitySalse=" + quantitySalse +
", batchCode='" + batchCode + '\'' +
", warehouseId=" + warehouseId +

14
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtSalseLine.java
View File

@ -45,6 +45,9 @@ public class WmRtSalseLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 退货数量 */
@Excel(name = "退货数量")
private BigDecimal quantityRted;
@ -106,7 +109,15 @@ public class WmRtSalseLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public void setLineId(Long lineId)
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
}
@ -324,6 +335,7 @@ public class WmRtSalseLine extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantityRted", getQuantityRted())
.append("batchCode", getBatchCode())
.append("warehouseId", getWarehouseId())

14
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmSn.java
View File

@ -45,6 +45,9 @@ public class WmSn extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 批次号 */
@Excel(name = "批次号")
private String batchCode;
@ -80,7 +83,15 @@ public class WmSn extends BaseEntity
/** 预留字段4 */
private Long attr4;
public void setSnId(Long snId)
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setSnId(Long snId)
{
this.snId = snId;
}
@ -249,6 +260,7 @@ public class WmSn extends BaseEntity
", itemName='" + itemName + '\'' +
", specification='" + specification + '\'' +
", unitOfMeasure='" + unitOfMeasure + '\'' +
", unitName='" + unitName + '\'' +
", batchCode='" + batchCode + '\'' +
", snNum=" + snNum +
", genDate=" + genDate +

14
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransferLine.java
View File

@ -49,6 +49,9 @@ public class WmTransferLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 装箱数量 */
@Excel(name = "装箱数量")
private BigDecimal quantityTransfer;
@ -170,7 +173,15 @@ public class WmTransferLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public void setLineId(Long lineId)
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
}
@ -533,6 +544,7 @@ public class WmTransferLine extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantityTransfer", getQuantityTransfer())
.append("workorderId", getWorkorderId())
.append("workorderCode", getWorkorderCode())

9
ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml
View File

@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="barcodeUrl" column="barcode_url" />
<result property="quantityTransfered" column="quantity_transfered" />
<result property="status" column="status" />
@ -32,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectProCardVo">
select card_id, card_code, workorder_id, workorder_code, workorder_name, batch_code, item_id, item_code, item_name, specification, unit_of_measure, barcode_url, quantity_transfered, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_card
select card_id, card_code, workorder_id, workorder_code, workorder_name, batch_code, item_id, item_code, item_name, specification, unit_of_measure, unit_name, barcode_url, quantity_transfered, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_card
</sql>
<select id="selectProCardList" parameterType="ProCard" resultMap="ProCardResult">
@ -48,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="barcodeUrl != null and barcodeUrl != ''"> and barcode_url = #{barcodeUrl}</if>
<if test="quantityTransfered != null "> and quantity_transfered = #{quantityTransfered}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
@ -65,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="getStationList" parameterType="ProCard" resultMap="ProCardResult">
select pc.card_id,pc.card_code,pc.workorder_id,pc.workorder_code,pc.workorder_name,pc.item_id,pc.item_code,pc.item_name,pc.specification, pc.unit_of_measure,pc.quantity_transfered,
select pc.card_id,pc.card_code,pc.workorder_id,pc.workorder_code,pc.workorder_name,pc.item_id,pc.item_code,pc.item_name,pc.specification, pc.unit_of_measure,pc.unit_name,pc.quantity_transfered,
pcp.record_id,pcp.workstation_id,pcp.input_time
from pro_card pc
left join pro_card_process pcp
@ -94,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="barcodeUrl != null">barcode_url,</if>
<if test="quantityTransfered != null">quantity_transfered,</if>
<if test="status != null">status,</if>
@ -118,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="barcodeUrl != null">#{barcodeUrl},</if>
<if test="quantityTransfered != null">#{quantityTransfered},</if>
<if test="status != null">#{status},</if>
@ -146,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="barcodeUrl != null">barcode_url = #{barcodeUrl},</if>
<if test="quantityTransfered != null">quantity_transfered = #{quantityTransfered},</if>
<if test="status != null">status = #{status},</if>

7
ktg-mes/src/main/resources/mapper/pro/ProRouteProductMapper.xml
View File

@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantity" column="quantity" />
<result property="productionTime" column="production_time" />
<result property="timeUnitType" column="time_unit_type" />
@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectProRouteProductVo">
select record_id, route_id, item_id, item_code, item_name, specification, unit_of_measure, quantity, production_time, time_unit_type, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_route_product
select record_id, route_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity, production_time, time_unit_type, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_route_product
</sql>
@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantity != null "> and quantity = #{quantity}</if>
<if test="productionTime != null "> and production_time = #{productionTime}</if>
<if test="timeUnitType != null and timeUnitType != ''"> and time_unit_type = #{timeUnitType}</if>
@ -72,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantity != null">quantity,</if>
<if test="productionTime != null">production_time,</if>
<if test="timeUnitType != null">time_unit_type,</if>
@ -92,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantity != null">#{quantity},</if>
<if test="productionTime != null">#{productionTime},</if>
<if test="timeUnitType != null">#{timeUnitType},</if>
@ -116,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="productionTime != null">production_time = #{productionTime},</if>
<if test="timeUnitType != null">time_unit_type = #{timeUnitType},</if>

7
ktg-mes/src/main/resources/mapper/pro/ProWorkorderBomMapper.xml
View File

@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="itemSpc" column="item_spc" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="itemOrProduct" column="item_or_product" />
<result property="quantity" column="quantity" />
<result property="remark" column="remark" />
@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectProWorkorderBomVo">
select line_id, workorder_id, item_id, item_code, item_name, item_spc, unit_of_measure, item_or_product, quantity, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder_bom
select line_id, workorder_id, item_id, item_code, item_name, item_spc, unit_of_measure, unit_name, item_or_product, quantity, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder_bom
</sql>
<select id="selectProWorkorderBomList" parameterType="ProWorkorderBom" resultMap="ProWorkorderBomResult">
@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="itemSpc != null and itemSpc != ''"> and item_spc = #{itemSpc}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="itemOrProduct != null and itemOrProduct != ''"> and item_or_product = #{itemOrProduct}</if>
<if test="quantity != null "> and quantity = #{quantity}</if>
</where>
@ -57,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">item_name,</if>
<if test="itemSpc != null">item_spc,</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="itemOrProduct != null and itemOrProduct != ''">item_or_product,</if>
<if test="quantity != null">quantity,</if>
<if test="remark != null">remark,</if>
@ -76,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">#{itemName},</if>
<if test="itemSpc != null">#{itemSpc},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="itemOrProduct != null and itemOrProduct != ''">#{itemOrProduct},</if>
<if test="quantity != null">#{quantity},</if>
<if test="remark != null">#{remark},</if>
@ -99,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">item_name = #{itemName},</if>
<if test="itemSpc != null">item_spc = #{itemSpc},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="itemOrProduct != null and itemOrProduct != ''">item_or_product = #{itemOrProduct},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="remark != null">remark = #{remark},</if>

7
ktg-mes/src/main/resources/mapper/qc/QcTemplateProductMapper.xml
View File

@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityCheck" column="quantity_check" />
<result property="quantityUnqualified" column="quantity_unqualified" />
<result property="crRate" column="cr_rate" />
@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectQcTemplateProductVo">
select record_id, template_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_check, quantity_unqualified, cr_rate, maj_rate, min_rate, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_template_product
select record_id, template_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_check, quantity_unqualified, cr_rate, maj_rate, min_rate, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_template_product
</sql>
<select id="selectQcTemplateProductList" parameterType="QcTemplateProduct" resultMap="QcTemplateProductResult">
@ -41,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityCheck != null "> and quantity_check = #{quantityCheck}</if>
<if test="quantityUnqualified != null "> and quantity_unqualified = #{quantityUnqualified}</if>
<if test="crRate != null "> and cr_rate = #{crRate}</if>
@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityCheck != null">quantity_check,</if>
<if test="quantityUnqualified != null">quantity_unqualified,</if>
<if test="crRate != null">cr_rate,</if>
@ -90,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityCheck != null">#{quantityCheck},</if>
<if test="quantityUnqualified != null">#{quantityUnqualified},</if>
<if test="crRate != null">#{crRate},</if>
@ -116,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityCheck != null">quantity_check = #{quantityCheck},</if>
<if test="quantityUnqualified != null">quantity_unqualified = #{quantityUnqualified},</if>
<if test="crRate != null">cr_rate = #{crRate},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmOutsourceIssueLineMapper.xml
View File

@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityIssued" column="quantity_issued" />
<result property="batchCode" column="batch_code" />
<result property="warehouseId" column="warehouse_id" />
@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmOutsourceIssueLineVo">
select line_id, issue_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_issued, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_outsource_issue_line
select line_id, issue_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_issued, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_outsource_issue_line
</sql>
<select id="selectWmOutsourceIssueLineList" parameterType="WmOutsourceIssueLine" resultMap="WmOutsourceIssueLineResult">
@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityIssued != null "> and quantity_issued = #{quantityIssued}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@ -83,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityIssued != null">quantity_issued,</if>
<if test="batchCode != null">batch_code,</if>
<if test="warehouseId != null">warehouse_id,</if>
@ -112,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityIssued != null">#{quantityIssued},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="warehouseId != null">#{warehouseId},</if>
@ -145,6 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityIssued != null">quantity_issued = #{quantityIssued},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptLineMapper.xml
View File

@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityRecived" column="quantity_recived" />
<result property="batchCode" column="batch_code" />
<result property="warehouseId" column="warehouse_id" />
@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmOutsourceRecptLineVo">
select line_id, recpt_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, iqc_check, iqc_id, iqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_outsource_recpt_line
select line_id, recpt_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, iqc_check, iqc_id, iqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_outsource_recpt_line
</sql>
<select id="selectWmOutsourceRecptLineList" parameterType="WmOutsourceRecptLine" resultMap="WmOutsourceRecptLineResult">
@ -51,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityRecived != null "> and quantity_recived = #{quantityRecived}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@ -88,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityRecived != null">quantity_recived,</if>
<if test="batchCode != null">batch_code,</if>
<if test="warehouseId != null">warehouse_id,</if>
@ -120,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityRecived != null">#{quantityRecived},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="warehouseId != null">#{warehouseId},</if>
@ -156,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityRecived != null">quantity_recived = #{quantityRecived},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmPackageLineMapper.xml
View File

@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityPackage" column="quantity_package" />
<result property="workorderId" column="workorder_id" />
<result property="workorderCode" column="workorder_code" />
@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmPackageLineVo">
select line_id, package_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_package, workorder_id, workorder_code, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_package_line
select line_id, package_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_package, workorder_id, workorder_code, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_package_line
</sql>
<select id="selectWmPackageLineList" parameterType="WmPackageLine" resultMap="WmPackageLineResult">
@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityPackage != null "> and quantity_package = #{quantityPackage}</if>
<if test="workorderId != null "> and workorder_id = #{workorderId}</if>
<if test="workorderCode != null and workorderCode != ''"> and workorder_code = #{workorderCode}</if>
@ -86,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityPackage != null">quantity_package,</if>
<if test="workorderId != null">workorder_id,</if>
<if test="workorderCode != null">workorder_code,</if>
@ -118,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityPackage != null">#{quantityPackage},</if>
<if test="workorderId != null">#{workorderId},</if>
<if test="workorderCode != null">#{workorderCode},</if>
@ -154,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityPackage != null">quantity_package = #{quantityPackage},</if>
<if test="workorderId != null">workorder_id = #{workorderId},</if>
<if test="workorderCode != null">workorder_code = #{workorderCode},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmProductSalseLineMapper.xml
View File

@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantitySalse" column="quantity_salse" />
<result property="batchCode" column="batch_code" />
<result property="warehouseId" column="warehouse_id" />
@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmProductSalseLineVo">
select line_id, salse_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_salse, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, oqc_check,oqc_id,oqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_salse_line
select line_id, salse_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_salse, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, oqc_check,oqc_id,oqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_salse_line
</sql>
<select id="selectWmProductSalseLineList" parameterType="WmProductSalseLine" resultMap="WmProductSalseLineResult">
@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantitySalse != null "> and quantity_salse = #{quantitySalse}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantitySalse != null">quantity_salse,</if>
<if test="batchCode != null">batch_code,</if>
<if test="warehouseId != null">warehouse_id,</if>
@ -114,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantitySalse != null">#{quantitySalse},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="warehouseId != null">#{warehouseId},</if>
@ -150,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantitySalse != null">quantity_salse = #{quantitySalse},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmRtSalseLineMapper.xml
View File

@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityRted" column="quantity_rted" />
<result property="batchCode" column="batch_code" />
<result property="warehouseId" column="warehouse_id" />
@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmRtSalseLineVo">
select line_id, rt_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_rted, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_salse_line
select line_id, rt_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_rted, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_salse_line
</sql>
<select id="selectWmRtSalseLineList" parameterType="WmRtSalseLine" resultMap="WmRtSalseLineResult">
@ -48,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityRted != null "> and quantity_rted = #{quantityRted}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@ -77,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityRted != null">quantity_rted,</if>
<if test="batchCode != null">batch_code,</if>
<if test="warehouseId != null">warehouse_id,</if>
@ -106,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityRted != null">#{quantityRted},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="warehouseId != null">#{warehouseId},</if>
@ -139,6 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName}</if>
<if test="quantityRted != null">quantity_rted = #{quantityRted},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

18
ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml
View File

@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="batchCode" column="batch_code" />
<result property="snNum" column="snNum"></result>
<result property="workorderId" column="workorder_id"></result>
@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="batchCode" column="batch_code" />
<result property="snNum" column="snNum"></result>
<result property="workorderId" column="workorder_id"></result>
@ -56,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmSnVo">
select sn_id, sn_code, item_id, item_code, item_name, specification, unit_of_measure, batch_code, workorder_id, gen_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_sn
select sn_id, sn_code, item_id, item_code, item_name, specification, unit_of_measure, unit_name, batch_code, workorder_id, gen_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_sn
</sql>
<select id="selectWmSnList" parameterType="WmSn" resultMap="WmSnVOResult">
@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="workorderId != null and workorderId != ''"> and workorder_id = #{workorderId}</if>
</where>
@ -79,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectSnList" parameterType="WmSn" resultMap="WmSnResult">
select item_id, item_code, item_name, specification, unit_of_measure, batch_code,gen_date , count(*) as snNum
select item_id, item_code, item_name, specification, unit_of_measure, unit_name, batch_code,gen_date , count(*) as snNum
from wm_sn
<where>
<if test="snCode != null and snCode != ''"> and sn_code = #{snCode}</if>
@ -88,14 +91,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
</where>
group by item_id, item_code, item_name, specification, unit_of_measure, batch_code, gen_date
group by item_id, item_code, item_name, specification, unit_of_measure, unit_name, batch_code, gen_date
order by item_id,batch_code desc
</select>
<select id="getStationList" parameterType="WmSn" resultMap="WmSnResult">
select sn.sn_id,sn.sn_code,sn.workorder_id,wo.workorder_code, sn.item_id,sn.item_code,sn.item_name,sn.specification,sn.unit_of_measure,ps.input_time
select sn.sn_id,sn.sn_code,sn.workorder_id,wo.workorder_code, sn.item_id,sn.item_code,sn.item_name,sn.specification,sn.unit_of_measure,sn.unit_name,ps.input_time
from wm_sn sn
left join pro_sn_process ps
on sn.sn_id = ps.sn_id
@ -106,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by ps.input_time desc
</select>
<select id="getWmSnList" parameterType="WmSn" resultMap="WmSnVOResult">
select group_concat(sn_id) as ids, item_id, item_code, item_name, specification, unit_of_measure, batch_code,gen_date , count(*) as snNum
select group_concat(sn_id) as ids, item_id, item_code, item_name, specification, unit_of_measure, unit_name, batch_code,gen_date , count(*) as snNum
from wm_sn
<where>
<if test="snCode != null and snCode != ''"> and sn_code = #{snCode}</if>
@ -115,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
</where>
group by item_id, item_code, item_name, specification, unit_of_measure, batch_code, gen_date
@ -131,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="batchCode != null">batch_code,</if>
<if test="workorderId != null">workorder_id,</if>
<if test="genDate !=null">gen_date,</if>
@ -151,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="workorderId != null">#{workorderId},</if>
<if test="genDate !=null">#{genDate},</if>
@ -175,6 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="workorderId != null">workorder_id = #{workorderId},</if>
<if test="remark != null">remark = #{remark},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmTransferLineMapper.xml
View File

@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityTransfer" column="quantity_transfer" />
<result property="workorderId" column="workorder_id" />
<result property="workorderCode" column="workorder_code" />
@ -52,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmTransferLineVo">
select line_id, transfer_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_transfer, workorder_id, workorder_code, batch_code, from_warehouse_id, from_warehouse_code, from_warehouse_name, from_location_id, from_location_code, from_location_name, from_area_id, from_area_code, from_area_name, to_warehouse_id, to_warehouse_code, to_warehouse_name, to_location_id, to_location_code, to_location_name, to_area_id, to_area_code, to_area_name, expire_date, vendor_id, vendor_code, vendor_name, vendor_nick, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_transfer_line
select line_id, transfer_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_transfer, workorder_id, workorder_code, batch_code, from_warehouse_id, from_warehouse_code, from_warehouse_name, from_location_id, from_location_code, from_location_name, from_area_id, from_area_code, from_area_name, to_warehouse_id, to_warehouse_code, to_warehouse_name, to_location_id, to_location_code, to_location_name, to_area_id, to_area_code, to_area_name, expire_date, vendor_id, vendor_code, vendor_name, vendor_nick, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_transfer_line
</sql>
<select id="selectWmTransferLineList" parameterType="WmTransferLine" resultMap="WmTransferLineResult">
@ -65,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityTransfer != null "> and quantity_transfer = #{quantityTransfer}</if>
<if test="workorderId != null "> and workorder_id = #{workorderId}</if>
<if test="workorderCode != null and workorderCode != ''"> and workorder_code = #{workorderCode}</if>
@ -111,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityTransfer != null">quantity_transfer,</if>
<if test="workorderId != null">workorder_id,</if>
<if test="workorderCode != null">workorder_code,</if>
@ -156,6 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName}</if>
<if test="quantityTransfer != null">#{quantityTransfer},</if>
<if test="workorderId != null">#{workorderId},</if>
<if test="workorderCode != null">#{workorderCode},</if>
@ -205,6 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityTransfer != null">quantity_transfer = #{quantityTransfer},</if>
<if test="workorderId != null">workorder_id = #{workorderId},</if>
<if test="workorderCode != null">workorder_code = #{workorderCode},</if>