From 24c5ebb366753bc214f2f426782753d6202ef59a Mon Sep 17 00:00:00 2001 From: zhangxuanming <2260476558@qq.com> Date: Sat, 8 Feb 2025 16:36:14 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=94=80=E5=94=AE=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E3=80=81=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E3=80=81?= =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E8=B0=83=E6=8B=A8=E3=80=81=E8=A3=85=E7=AE=B1?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81SN=E7=A0=81=E3=80=81=E5=A4=96?= =?UTF-8?q?=E5=8D=8F=E5=8F=91=E6=96=99=E3=80=81=E5=A4=96=E5=8D=8F=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E3=80=81=E5=B7=A5=E8=89=BA=E6=B5=81=E7=A8=8B=E5=92=8C?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pro/controller/ProWorkorderController.java | 1 + .../java/com/ktg/mes/pro/domain/ProCard.java | 13 ++++++++++++- .../ktg/mes/pro/domain/ProRouteProduct.java | 14 +++++++++++++- .../com/ktg/mes/pro/domain/ProWorkorder.java | 14 +++++++++++++- .../ktg/mes/pro/domain/ProWorkorderBom.java | 14 +++++++++++++- .../ktg/mes/qc/domain/QcTemplateProduct.java | 14 +++++++++++++- .../mes/wm/domain/WmOutsourceIssueLine.java | 14 +++++++++++++- .../mes/wm/domain/WmOutsourceRecptLine.java | 14 +++++++++++++- .../com/ktg/mes/wm/domain/WmPackageLine.java | 14 +++++++++++++- .../ktg/mes/wm/domain/WmProductSalseLine.java | 14 +++++++++++++- .../com/ktg/mes/wm/domain/WmRtSalseLine.java | 14 +++++++++++++- .../main/java/com/ktg/mes/wm/domain/WmSn.java | 14 +++++++++++++- .../com/ktg/mes/wm/domain/WmTransferLine.java | 14 +++++++++++++- .../resources/mapper/pro/ProCardMapper.xml | 9 +++++++-- .../mapper/pro/ProRouteProductMapper.xml | 7 ++++++- .../mapper/pro/ProWorkorderBomMapper.xml | 7 ++++++- .../mapper/qc/QcTemplateProductMapper.xml | 7 ++++++- .../mapper/wm/WmOutsourceIssueLineMapper.xml | 7 ++++++- .../mapper/wm/WmOutsourceRecptLineMapper.xml | 7 ++++++- .../mapper/wm/WmPackageLineMapper.xml | 7 ++++++- .../mapper/wm/WmProductSalseLineMapper.xml | 7 ++++++- .../mapper/wm/WmRtSalseLineMapper.xml | 7 ++++++- .../main/resources/mapper/wm/WmSnMapper.xml | 18 +++++++++++++----- .../mapper/wm/WmTransferLineMapper.xml | 7 ++++++- 24 files changed, 230 insertions(+), 28 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java index eb2a787..904ee12 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java @@ -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)); diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProCard.java b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProCard.java index b5fd15d..e37581d 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProCard.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProCard.java @@ -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()) diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProRouteProduct.java b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProRouteProduct.java index b7a0b44..86673f3 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProRouteProduct.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProRouteProduct.java @@ -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()) diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java index 7554e91..8fec333 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java @@ -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 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 + diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorderBom.java b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorderBom.java index 562a668..06a8b48 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorderBom.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorderBom.java @@ -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()) diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcTemplateProduct.java b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcTemplateProduct.java index 50eda72..7b401ac 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcTemplateProduct.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcTemplateProduct.java @@ -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()) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceIssueLine.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceIssueLine.java index e1ca171..96c4f68 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceIssueLine.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceIssueLine.java @@ -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()) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceRecptLine.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceRecptLine.java index b411d72..080df52 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceRecptLine.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceRecptLine.java @@ -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()) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmPackageLine.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmPackageLine.java index 2f2de99..3abc2d4 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmPackageLine.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmPackageLine.java @@ -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()) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductSalseLine.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductSalseLine.java index 48cc9ef..8829429 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductSalseLine.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductSalseLine.java @@ -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 + diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtSalseLine.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtSalseLine.java index 7033b6a..1e7b199 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtSalseLine.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtSalseLine.java @@ -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()) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmSn.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmSn.java index b1f1312..5904c71 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmSn.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmSn.java @@ -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 + diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransferLine.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransferLine.java index 2523e9c..b3bf8b0 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransferLine.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransferLine.java @@ -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()) diff --git a/ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml index 93ca620..0c5adc9 100644 --- a/ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml +++ b/ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml @@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -32,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 @@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and item_name like concat('%', #{itemName}, '%') and item_spc = #{itemSpc} and unit_of_measure = #{unitOfMeasure} + and unit_name = #{unitName} and item_or_product = #{itemOrProduct} and quantity = #{quantity} @@ -57,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name, item_spc, unit_of_measure, + unit_name, item_or_product, quantity, remark, @@ -76,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{itemName}, #{itemSpc}, #{unitOfMeasure}, + #{unitName}, #{itemOrProduct}, #{quantity}, #{remark}, @@ -99,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name = #{itemName}, item_spc = #{itemSpc}, unit_of_measure = #{unitOfMeasure}, + unit_name = #{unitName}, item_or_product = #{itemOrProduct}, quantity = #{quantity}, remark = #{remark}, diff --git a/ktg-mes/src/main/resources/mapper/qc/QcTemplateProductMapper.xml b/ktg-mes/src/main/resources/mapper/qc/QcTemplateProductMapper.xml index 5550a21..f83bf1f 100644 --- a/ktg-mes/src/main/resources/mapper/qc/QcTemplateProductMapper.xml +++ b/ktg-mes/src/main/resources/mapper/qc/QcTemplateProductMapper.xml @@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 @@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and item_name like concat('%', #{itemName}, '%') and specification = #{specification} and unit_of_measure = #{unitOfMeasure} + and unit_name = #{unitName} and quantity_issued = #{quantityIssued} and batch_code = #{batchCode} and warehouse_id = #{warehouseId} @@ -83,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name, specification, unit_of_measure, + unit_name, quantity_issued, batch_code, warehouse_id, @@ -112,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{itemName}, #{specification}, #{unitOfMeasure}, + #{unitName}, #{quantityIssued}, #{batchCode}, #{warehouseId}, @@ -145,6 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name = #{itemName}, specification = #{specification}, unit_of_measure = #{unitOfMeasure}, + unit_name = #{unitName}, quantity_issued = #{quantityIssued}, batch_code = #{batchCode}, warehouse_id = #{warehouseId}, diff --git a/ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptLineMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptLineMapper.xml index 54d68a8..019a41f 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptLineMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptLineMapper.xml @@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 @@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and item_name like concat('%', #{itemName}, '%') and specification = #{specification} and unit_of_measure = #{unitOfMeasure} + and unit_name = #{unitName} and quantity_package = #{quantityPackage} and workorder_id = #{workorderId} and workorder_code = #{workorderCode} @@ -86,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name, specification, unit_of_measure, + unit_name, quantity_package, workorder_id, workorder_code, @@ -118,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{itemName}, #{specification}, #{unitOfMeasure}, + #{unitName}, #{quantityPackage}, #{workorderId}, #{workorderCode}, @@ -154,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name = #{itemName}, specification = #{specification}, unit_of_measure = #{unitOfMeasure}, + unit_name = #{unitName}, quantity_package = #{quantityPackage}, workorder_id = #{workorderId}, workorder_code = #{workorderCode}, diff --git a/ktg-mes/src/main/resources/mapper/wm/WmProductSalseLineMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmProductSalseLineMapper.xml index e190efc..025fc78 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmProductSalseLineMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmProductSalseLineMapper.xml @@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 @@ -48,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and item_name like concat('%', #{itemName}, '%') and specification = #{specification} and unit_of_measure = #{unitOfMeasure} + and unit_name = #{unitName} and quantity_rted = #{quantityRted} and batch_code = #{batchCode} and warehouse_id = #{warehouseId} @@ -77,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name, specification, unit_of_measure, + unit_name, quantity_rted, batch_code, warehouse_id, @@ -106,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{itemName}, #{specification}, #{unitOfMeasure}, + #{unitName}, #{quantityRted}, #{batchCode}, #{warehouseId}, @@ -139,6 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name = #{itemName}, specification = #{specification}, unit_of_measure = #{unitOfMeasure}, + unit_name = #{unitName} quantity_rted = #{quantityRted}, batch_code = #{batchCode}, warehouse_id = #{warehouseId}, diff --git a/ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml index dba1566..93ab488 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml @@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -56,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 @@ -65,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and item_name like concat('%', #{itemName}, '%') and specification = #{specification} and unit_of_measure = #{unitOfMeasure} + and unit_name = #{unitName} and quantity_transfer = #{quantityTransfer} and workorder_id = #{workorderId} and workorder_code = #{workorderCode} @@ -111,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name, specification, unit_of_measure, + unit_name, quantity_transfer, workorder_id, workorder_code, @@ -156,6 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{itemName}, #{specification}, #{unitOfMeasure}, + #{unitName} #{quantityTransfer}, #{workorderId}, #{workorderCode}, @@ -205,6 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name = #{itemName}, specification = #{specification}, unit_of_measure = #{unitOfMeasure}, + unit_name = #{unitName}, quantity_transfer = #{quantityTransfer}, workorder_id = #{workorderId}, workorder_code = #{workorderCode},