wms修改18.1-报工页面的sap收货按钮，和成品入库页面的过账按钮修改

1 year ago · 9e37514457
parent 54e2e97eca
commit 9e37514457
7 changed files with 679 additions and 23 deletions
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/MesReportWork.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/MesReportWork.java
@ -0,0 +1,674 @@
+package com.op.system.api.domain.wms;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.op.common.core.annotation.Excel;
+import com.op.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 报工报表对象 mes_report_work
+ *是
+ * @author Open Platform
+ * @date 2023-08-24
+ */
+public class MesReportWork extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 记录id */
+    private String id;
+
+    /** 报工单编号 */
+    @Excel(name = "报工单编号")
+    private String reportCode;
+
+    /** 报工类型，报工类型：SELF自行报工、UNI统一报工 */
+    @Excel(name = "报工类型，报工类型：SELF上位机报工、UNI系统报工")
+    private String reportType;
+
+    /** 生产工单编码 */
+    @Excel(name = "生产工单编码")
+    private String workorderCode;
+
+    /** 产品编码 */
+    @Excel(name = "产品编码")
+    private String productCode;
+
+    /** 产品名称 */
+    @Excel(name = "产品名称")
+    private String productName;
+
+    /** 规格型号 */
+    @Excel(name = "规格型号")
+    private String spec;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+    private String   SAPstatus;
+    private String SAPmessage;
+
+    public String getSAPstatus() {
+        return SAPstatus;
+    }
+
+    public void setSAPstatus(String SAPstatus) {
+        this.SAPstatus = SAPstatus;
+    }
+
+    public String getSAPmessage() {
+        return SAPmessage;
+    }
+
+    public void setSAPmessage(String SAPmessage) {
+        this.SAPmessage = SAPmessage;
+    }
+
+    /** 排产数量 */
+    @Excel(name = "排产数量")
+    private BigDecimal quantity;
+    private BigDecimal quantitySplit;
+    /** 本次报工数量 */
+    @Excel(name = "本次报工数量")
+    private BigDecimal quantityFeedback;
+
+    /** 合格数量 */
+    //@Excel(name = "合格数量")
+    private BigDecimal quantityQualified;
+
+    /** 不合格数量 */
+    //@Excel(name = "不合格数量")
+    private BigDecimal quantityUnqualified;
+
+    /** 报工人员 */
+    @Excel(name = "报工人员")
+    private String userName;
+
+    /** 人员名称 */
+    @Excel(name = "人员名称")
+    private String nickName;
+
+    /** 报工途径：PAD、MOBILE、PC */
+    //@Excel(name = "报工途径：PAD、MOBILE、PC")
+    private String feedbackChannel;
+
+    /** 报工时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "报工时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date feedbackTime;
+
+    /** 录入人员 */
+    @Excel(name = "录入人员")
+    private String recordUser;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String status;
+
+    /** 工时 */
+    @Excel(name = "工时")
+    private Long workTime;
+
+    @Excel(name = "用人")
+    private Long useMan;
+
+    /** 线体编码 */
+    @Excel(name = "线体编码")
+    private String machineCode;
+
+    /** 线体名称 */
+    @Excel(name = "线体名称")
+    private String machineName;
+
+    /** 班组编码 */
+    @Excel(name = "班组编码")
+    private String teamCode;
+
+    /** 班次编码 */
+    @Excel(name = "班次编码")
+    private String shiftCode;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "SAP报工时间")
+    private Date uploadTime;
+    @Excel(name = "SAP报工状态0待报工1成功2失败")
+    private String uploadStatus;
+    @Excel(name = "SAP报工信息")
+    private String uploadMsg;
+    /** 预留字段1 */
+    //@Excel(name = "预留字段1")
+    private String attr1;
+
+    /** 预留字段2 */
+    //@Excel(name = "预留字段2")
+    private String attr2;
+
+    /** 预留字段3 */
+    //@Excel(name = "预留字段3")
+    private String attr3;
+
+    /** 预留字段4 */
+    //@Excel(name = "预留字段4")
+    private String attr4;
+    @Excel(name = "计划生产日期")
+    private String productDate;
+    private String productDateStart;
+    private String productDateEnd;
+    @Excel(name = "订单编号")
+    private String orderCode;
+    @Excel(name = "规格型号")
+    private String productSpc;
+    @Excel(name = "工序名称")
+    private String processName;
+    @Excel(name = "工序编码")
+    private String processCode;
+    private String factoryCode;
+    private String factoryName;
+    private String carCode;
+    private String carName;
+    private String workorderCodeSap;
+    private String routeCode;
+    private String sac1;
+    private String sac2;
+    private String  sac3;
+    private String  sac4;
+    private String  sac5;
+    private String  sac6;
+    private String prodType;
+    private String createTimeStart;
+    private String createTimeEnd;
+    private String feedbackTimeStart;
+    private String feedbackTimeEnd;
+    private String batch;
+    private String endReport;
+    private String whCode;
+
+    public String getWhCode() {
+        return whCode;
+    }
+
+    public void setWhCode(String whCode) {
+        this.whCode = whCode;
+    }
+
+    public String getEndReport() {
+        return endReport;
+    }
+
+    public void setEndReport(String endReport) {
+        this.endReport = endReport;
+    }
+
+    public String getBatch() {
+        return batch;
+    }
+
+    public void setBatch(String batch) {
+        this.batch = batch;
+    }
+
+    public Long getUseMan() {
+        return useMan;
+    }
+
+    public void setUseMan(Long useMan) {
+        this.useMan = useMan;
+    }
+
+    public BigDecimal getQuantitySplit() {
+        return quantitySplit;
+    }
+
+    public void setQuantitySplit(BigDecimal quantitySplit) {
+        this.quantitySplit = quantitySplit;
+    }
+
+    public String getFeedbackTimeStart() {
+        return feedbackTimeStart;
+    }
+
+    public void setFeedbackTimeStart(String feedbackTimeStart) {
+        this.feedbackTimeStart = feedbackTimeStart;
+    }
+
+    public String getFeedbackTimeEnd() {
+        return feedbackTimeEnd;
+    }
+
+    public void setFeedbackTimeEnd(String feedbackTimeEnd) {
+        this.feedbackTimeEnd = feedbackTimeEnd;
+    }
+
+    public String getCreateTimeStart() {
+        return createTimeStart;
+    }
+
+    public void setCreateTimeStart(String createTimeStart) {
+        this.createTimeStart = createTimeStart;
+    }
+
+    public String getCreateTimeEnd() {
+        return createTimeEnd;
+    }
+
+    public void setCreateTimeEnd(String createTimeEnd) {
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    public String getProdType() {
+        return prodType;
+    }
+
+    public void setProdType(String prodType) {
+        this.prodType = prodType;
+    }
+
+    public String getWorkorderCodeSap() {
+        return workorderCodeSap;
+    }
+
+    public void setWorkorderCodeSap(String workorderCodeSap) {
+        this.workorderCodeSap = workorderCodeSap;
+    }
+
+    public String getRouteCode() {
+        return routeCode;
+    }
+
+    public void setRouteCode(String routeCode) {
+        this.routeCode = routeCode;
+    }
+
+    public String getSac1() {
+        return sac1;
+    }
+
+    public void setSac1(String sac1) {
+        this.sac1 = sac1;
+    }
+
+    public String getSac2() {
+        return sac2;
+    }
+
+    public void setSac2(String sac2) {
+        this.sac2 = sac2;
+    }
+
+    public String getSac3() {
+        return sac3;
+    }
+
+    public void setSac3(String sac3) {
+        this.sac3 = sac3;
+    }
+
+    public String getSac4() {
+        return sac4;
+    }
+
+    public void setSac4(String sac4) {
+        this.sac4 = sac4;
+    }
+
+    public String getSac5() {
+        return sac5;
+    }
+
+    public void setSac5(String sac5) {
+        this.sac5 = sac5;
+    }
+
+    public String getSac6() {
+        return sac6;
+    }
+
+    public void setSac6(String sac6) {
+        this.sac6 = sac6;
+    }
+
+    public Date getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(Date uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    public String getUploadStatus() {
+        return uploadStatus;
+    }
+
+    public void setUploadStatus(String uploadStatus) {
+        this.uploadStatus = uploadStatus;
+    }
+
+    public String getUploadMsg() {
+        return uploadMsg;
+    }
+
+    public void setUploadMsg(String uploadMsg) {
+        this.uploadMsg = uploadMsg;
+    }
+
+    public String getFactoryCode() {
+        return factoryCode;
+    }
+
+    public void setFactoryCode(String factoryCode) {
+        this.factoryCode = factoryCode;
+    }
+
+    public String getFactoryName() {
+        return factoryName;
+    }
+
+    public void setFactoryName(String factoryName) {
+        this.factoryName = factoryName;
+    }
+
+    public String getCarCode() {
+        return carCode;
+    }
+
+    public void setCarCode(String carCode) {
+        this.carCode = carCode;
+    }
+
+    public String getCarName() {
+        return carName;
+    }
+
+    public void setCarName(String carName) {
+        this.carName = carName;
+    }
+
+    public String getProcessCode() {
+        return processCode;
+    }
+
+    public void setProcessCode(String processCode) {
+        this.processCode = processCode;
+    }
+
+    public String getProductDateStart() {
+        return productDateStart;
+    }
+
+    public void setProductDateStart(String productDateStart) {
+        this.productDateStart = productDateStart;
+    }
+
+    public String getProductDateEnd() {
+        return productDateEnd;
+    }
+
+    public void setProductDateEnd(String productDateEnd) {
+        this.productDateEnd = productDateEnd;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setReportType(String reportType) {
+        this.reportType = reportType;
+    }
+    public String getReportType() {
+        return reportType;
+    }
+
+    public void setReportCode(String reportCode) {
+        this.reportCode = reportCode;
+    }
+    public String getReportCode() {
+        return reportCode;
+    }
+
+    public void setWorkorderCode(String workorderCode) {
+        this.workorderCode = workorderCode;
+    }
+
+    public String getWorkorderCode() {
+        return workorderCode;
+    }
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
+
+    public String getProductCode() {
+        return productCode;
+    }
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+    public void setQuantity(BigDecimal quantity) {
+        this.quantity = quantity;
+    }
+
+    public BigDecimal getQuantity() {
+        return quantity;
+    }
+    public void setQuantityFeedback(BigDecimal quantityFeedback) {
+        this.quantityFeedback = quantityFeedback;
+    }
+
+    public BigDecimal getQuantityFeedback() {
+        return quantityFeedback;
+    }
+    public void setQuantityQualified(BigDecimal quantityQualified) {
+        this.quantityQualified = quantityQualified;
+    }
+
+    public BigDecimal getQuantityQualified() {
+        return quantityQualified;
+    }
+    public void setQuantityUnqualified(BigDecimal quantityUnqualified) {
+        this.quantityUnqualified = quantityUnqualified;
+    }
+
+    public BigDecimal getQuantityUnqualified() {
+        return quantityUnqualified;
+    }
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+    public void setFeedbackChannel(String feedbackChannel) {
+        this.feedbackChannel = feedbackChannel;
+    }
+
+    public String getFeedbackChannel() {
+        return feedbackChannel;
+    }
+    public void setFeedbackTime(Date feedbackTime) {
+        this.feedbackTime = feedbackTime;
+    }
+
+    public Date getFeedbackTime() {
+        return feedbackTime;
+    }
+    public void setRecordUser(String recordUser) {
+        this.recordUser = recordUser;
+    }
+
+    public String getRecordUser() {
+        return recordUser;
+    }
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+    public void setWorkTime(Long workTime) {
+        this.workTime = workTime;
+    }
+
+    public Long getWorkTime() {
+        return workTime;
+    }
+    public void setMachineCode(String machineCode) {
+        this.machineCode = machineCode;
+    }
+
+    public String getMachineCode() {
+        return machineCode;
+    }
+    public void setMachineName(String machineName) {
+        this.machineName = machineName;
+    }
+
+    public String getMachineName() {
+        return machineName;
+    }
+    public void setTeamCode(String teamCode) {
+        this.teamCode = teamCode;
+    }
+
+    public String getTeamCode() {
+        return teamCode;
+    }
+    public void setShiftCode(String shiftCode) {
+        this.shiftCode = shiftCode;
+    }
+
+    public String getShiftCode() {
+        return shiftCode;
+    }
+    public void setAttr1(String attr1) {
+        this.attr1 = attr1;
+    }
+
+    public String getAttr1() {
+        return attr1;
+    }
+    public void setAttr2(String attr2) {
+        this.attr2 = attr2;
+    }
+
+    public String getAttr2() {
+        return attr2;
+    }
+    public void setAttr3(String attr3) {
+        this.attr3 = attr3;
+    }
+
+    public String getAttr3() {
+        return attr3;
+    }
+    public void setAttr4(String attr4) {
+        this.attr4 = attr4;
+    }
+
+    public String getAttr4() {
+        return attr4;
+    }
+
+    public String getProductDate() {
+        return productDate;
+    }
+
+    public void setProductDate(String productDate) {
+        this.productDate = productDate;
+    }
+
+    public String getOrderCode() {
+        return orderCode;
+    }
+
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
+    }
+
+    public String getProductSpc() {
+        return productSpc;
+    }
+
+    public void setProductSpc(String productSpc) {
+        this.productSpc = productSpc;
+    }
+
+    public String getProcessName() {
+        return processName;
+    }
+
+    public void setProcessName(String processName) {
+        this.processName = processName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("reportType", getReportType())
+                .append("reportCode", getReportCode())
+                .append("workorderCode", getWorkorderCode())
+                .append("productCode", getProductCode())
+                .append("productName", getProductName())
+                .append("spec", getSpec())
+                .append("unit", getUnit())
+                .append("quantity", getQuantity())
+                .append("quantityFeedback", getQuantityFeedback())
+                .append("quantityQualified", getQuantityQualified())
+                .append("quantityUnqualified", getQuantityUnqualified())
+                .append("userName", getUserName())
+                .append("nickName", getNickName())
+                .append("feedbackChannel", getFeedbackChannel())
+                .append("feedbackTime", getFeedbackTime())
+                .append("recordUser", getRecordUser())
+                .append("status", getStatus())
+                .append("remark", getRemark())
+                .append("workTime", getWorkTime())
+                .append("machineCode", getMachineCode())
+                .append("machineName", getMachineName())
+                .append("teamCode", getTeamCode())
+                .append("shiftCode", getShiftCode())
+                .append("attr1", getAttr1())
+                .append("attr2", getAttr2())
+                .append("attr3", getAttr3())
+                .append("attr4", getAttr4())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
+                .append("updateBy", getUpdateBy())
+                .toString();
+    }
+}
+
--- a/op-modules/op-device/src/main/java/com/op/device/domain/MesReportWork.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/MesReportWork.java
@ -48,24 +48,6 @@ public class MesReportWork extends BaseEntity {
    /** 单位 */
    @Excel(name = "单位")
    private String unit;
-    private String   SAPstatus;
-    private String SAPmessage;
-
-    public String getSAPstatus() {
-        return SAPstatus;
-    }
-
-    public void setSAPstatus(String SAPstatus) {
-        this.SAPstatus = SAPstatus;
-    }
-
-    public String getSAPmessage() {
-        return SAPmessage;
-    }
-
-    public void setSAPmessage(String SAPmessage) {
-        this.SAPmessage = SAPmessage;
-    }

    /** 排产数量 */
    @Excel(name = "排产数量")
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java
@ -3,7 +3,7 @@ package com.op.wms.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;

-import com.op.device.domain.MesReportWork;
+import com.op.system.api.domain.wms.MesReportWork;

 import com.op.wms.domain.WmsProductPut;
 import org.springframework.beans.factory.annotation.Autowired;
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java
@ -3,7 +3,7 @@ package com.op.wms.mapper;
 import java.util.List;


-import com.op.device.domain.MesReportWork;
+import com.op.system.api.domain.wms.MesReportWork;
 import com.op.wms.domain.WmsProductPut;
 import org.apache.ibatis.annotations.Param;

--- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java
@ -2,7 +2,7 @@ package com.op.wms.service;

 import java.util.List;

-import com.op.device.domain.MesReportWork;
+import com.op.system.api.domain.wms.MesReportWork;
 import com.op.wms.domain.WmsProductPut;

 /**
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
@ -10,7 +10,7 @@ import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.domain.R;
 import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.uuid.IdUtils;
-import com.op.device.domain.MesReportWork;
+import com.op.system.api.domain.wms.MesReportWork;
 import com.op.system.api.RemoteSapService;
 import com.op.wms.domain.*;
 import com.op.wms.mapper.*;
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
@ -288,7 +288,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		  AND	wms_product_put.status= '1'
 		  AND wms_product_put.SAP_status IN ( 0, 2 )
 	</select>
-	<select id="getReportList" resultType="com.op.device.domain.MesReportWork">
+	<select id="getReportList" resultType="com.op.system.api.domain.wms.MesReportWork">
 		SELECT
 			mes_report_work.id,
 			mes_report_work.workorder_code workorderCode,