Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApplyPick.java

@@ -1,119 +0,0 @@
-package com.iamberry.rst.core.approval;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import  java.util.Date;
-import  java.io.Serializable;
-/**
- *  提货申请信息类
- * @author
- * @Date 2018-09-19
- */
-public class ApplyPick  implements  Serializable{
-    private static final long serialVersionUID = -8874322751370182090L;
-    //主键
-    private Integer applyPickId;
-    //审批订单主键
-    private Integer approvalId;
-    //申请人id
-    private Integer adminId;
-    //提货人姓名
-    private String applyPickName;
-    //提货人电话号码
-    private String applyPickTel;
-    //提货原因
-    private String applyPickReason;
-    //提货状态1:未发货 2:已发货
-    private Integer applyPickStruts;
-    //备注信息
-    private String applyPickRemk;
-    //创建时间
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-    private Date applyPickCreateTime;
-    //修改时间
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-    private Date applyPickUpdateTime;
-
-    public Integer getApplyPickId(){
-        return applyPickId;
-    }
-
-    public void setApplyPickId(Integer  applyPickId){
-        this.applyPickId=applyPickId;
-    }
-
-    public Integer getApprovalId(){
-        return approvalId;
-    }
-
-    public void setApprovalId(Integer  approvalId){
-        this.approvalId=approvalId;
-    }
-
-    public Integer getAdminId(){
-        return adminId;
-    }
-
-    public void setAdminId(Integer  adminId){
-        this.adminId=adminId;
-    }
-
-    public String getApplyPickName(){
-        return applyPickName;
-    }
-
-    public void setApplyPickName(String  applyPickName){
-        this.applyPickName=applyPickName;
-    }
-
-    public String getApplyPickTel(){
-        return applyPickTel;
-    }
-
-    public void setApplyPickTel(String  applyPickTel){
-        this.applyPickTel=applyPickTel;
-    }
-
-    public String getApplyPickReason(){
-        return applyPickReason;
-    }
-
-    public void setApplyPickReason(String  applyPickReason){
-        this.applyPickReason=applyPickReason;
-    }
-
-    public Integer getApplyPickStruts(){
-        return applyPickStruts;
-    }
-
-    public void setApplyPickStruts(Integer  applyPickStruts){
-        this.applyPickStruts=applyPickStruts;
-    }
-
-    public String getApplyPickRemk(){
-        return applyPickRemk;
-    }
-
-    public void setApplyPickRemk(String  applyPickRemk){
-        this.applyPickRemk=applyPickRemk;
-    }
-
-    public Date getApplyPickCreateTime(){
-        return applyPickCreateTime;
-    }
-
-    public void setApplyPickCreateTime(Date  applyPickCreateTime){
-        this.applyPickCreateTime=applyPickCreateTime;
-    }
-
-    public Date getApplyPickUpdateTime(){
-        return applyPickUpdateTime;
-    }
-
-    public void setApplyPickUpdateTime(Date  applyPickUpdateTime){
-        this.applyPickUpdateTime=applyPickUpdateTime;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApplyPickItem.java

@@ -1,109 +0,0 @@
-package com.iamberry.rst.core.approval;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import  java.util.Date;
-import  java.io.Serializable;
-/**
- *  提货项信息类
- * @author
- * @Date 2018-09-19
- */
-public class ApplyPickItem  implements  Serializable{
-    private static final long serialVersionUID = 4180448063080320150L;
-    //主键
-    private Integer applyItemId;
-    //提货申请id
-    private Integer applyPickId;
-    //产品id
-    private Integer applyItemProductId;
-    //颜色id
-    private Integer applyItemColorId;
-    //产品名称
-    private String applyItemProductName;
-    //颜色名称
-    private String applyItemColorName;
-    //产品数量
-    private Integer applyItemProductNum;
-    //创建时间
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-    private Date applyItemCreateTime;
-    //修改时间
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-    private Date applyItemUpdateTime;
-
-    public Integer getApplyItemId(){
-        return applyItemId;
-    }
-
-    public void setApplyItemId(Integer  applyItemId){
-        this.applyItemId=applyItemId;
-    }
-
-    public Integer getApplyPickId(){
-        return applyPickId;
-    }
-
-    public void setApplyPickId(Integer  applyPickId){
-        this.applyPickId=applyPickId;
-    }
-
-    public Integer getApplyItemProductId(){
-        return applyItemProductId;
-    }
-
-    public void setApplyItemProductId(Integer  applyItemProductId){
-        this.applyItemProductId=applyItemProductId;
-    }
-
-    public Integer getApplyItemColorId(){
-        return applyItemColorId;
-    }
-
-    public void setApplyItemColorId(Integer  applyItemColorId){
-        this.applyItemColorId=applyItemColorId;
-    }
-
-    public String getApplyItemProductName(){
-        return applyItemProductName;
-    }
-
-    public void setApplyItemProductName(String  applyItemProductName){
-        this.applyItemProductName=applyItemProductName;
-    }
-
-    public String getApplyItemColorName(){
-        return applyItemColorName;
-    }
-
-    public void setApplyItemColorName(String  applyItemColorName){
-        this.applyItemColorName=applyItemColorName;
-    }
-
-    public Integer getApplyItemProductNum(){
-        return applyItemProductNum;
-    }
-
-    public void setApplyItemProductNum(Integer  applyItemProductNum){
-        this.applyItemProductNum=applyItemProductNum;
-    }
-
-    public Date getApplyItemCreateTime(){
-        return applyItemCreateTime;
-    }
-
-    public void setApplyItemCreateTime(Date  applyItemCreateTime){
-        this.applyItemCreateTime=applyItemCreateTime;
-    }
-
-    public Date getApplyItemUpdateTime(){
-        return applyItemUpdateTime;
-    }
-
-    public void setApplyItemUpdateTime(Date  applyItemUpdateTime){
-        this.applyItemUpdateTime=applyItemUpdateTime;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalApplyPick.java

@@ -0,0 +1,20 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+
+/**
+ * Created by Administrator on 2018/9/29.
+ */
+public class ApprovalApplyPick implements Serializable{
+    private Integer applyPickId;//
+    private Integer approvalId;//审批订单信息id
+    private Integer adminId;//申请人id
+    private Integer applyPickName;//姓名
+    private Integer applyPickTel;//手机号码
+    private Integer applyPickReason;//提货原因
+    private Integer applyPickStruts;//提货状态1:未发货  2:已发货
+    private Integer applyPickRemk;//备注信息
+    private Integer applyPickCreateTime;//
+    private Integer applyPickUpdateTime;//
+
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalApplyPickItem.java

@@ -0,0 +1,118 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+
+/**
+ * Created by Administrator on 2018/9/29.
+ */
+public class ApprovalApplyPickItem implements Serializable{
+    private static final long serialVersionUID = -3566469572724340861L;
+    private Integer applyitemid;//
+    private Integer applyPickId;//提货id
+    private Integer productId;//产品id
+    private String itemProductName;//产品名称
+    private String itemColorName;//颜色名称
+    private Integer itemProductNum;//产品数量
+    private String itemBrandName;//品牌名称
+    private String itemProductModel;//产品型号
+    private String itemProductUnit;//单位
+    private Integer itemProductBoxNumber;//箱数/套数
+    private Integer itemCreateTime;//
+    private Integer itemUpdateTime;//
+
+    public Integer getApplyitemid() {
+        return applyitemid;
+    }
+
+    public void setApplyitemid(Integer applyitemid) {
+        this.applyitemid = applyitemid;
+    }
+
+    public Integer getApplyPickId() {
+        return applyPickId;
+    }
+
+    public void setApplyPickId(Integer applyPickId) {
+        this.applyPickId = applyPickId;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public String getItemProductName() {
+        return itemProductName;
+    }
+
+    public void setItemProductName(String itemProductName) {
+        this.itemProductName = itemProductName;
+    }
+
+    public String getItemColorName() {
+        return itemColorName;
+    }
+
+    public void setItemColorName(String itemColorName) {
+        this.itemColorName = itemColorName;
+    }
+
+    public Integer getItemProductNum() {
+        return itemProductNum;
+    }
+
+    public void setItemProductNum(Integer itemProductNum) {
+        this.itemProductNum = itemProductNum;
+    }
+
+    public String getItemBrandName() {
+        return itemBrandName;
+    }
+
+    public void setItemBrandName(String itemBrandName) {
+        this.itemBrandName = itemBrandName;
+    }
+
+    public String getItemProductModel() {
+        return itemProductModel;
+    }
+
+    public void setItemProductModel(String itemProductModel) {
+        this.itemProductModel = itemProductModel;
+    }
+
+    public String getItemProductUnit() {
+        return itemProductUnit;
+    }
+
+    public void setItemProductUnit(String itemProductUnit) {
+        this.itemProductUnit = itemProductUnit;
+    }
+
+    public Integer getItemProductBoxNumber() {
+        return itemProductBoxNumber;
+    }
+
+    public void setItemProductBoxNumber(Integer itemProductBoxNumber) {
+        this.itemProductBoxNumber = itemProductBoxNumber;
+    }
+
+    public Integer getItemCreateTime() {
+        return itemCreateTime;
+    }
+
+    public void setItemCreateTime(Integer itemCreateTime) {
+        this.itemCreateTime = itemCreateTime;
+    }
+
+    public Integer getItemUpdateTime() {
+        return itemUpdateTime;
+    }
+
+    public void setItemUpdateTime(Integer itemUpdateTime) {
+        this.itemUpdateTime = itemUpdateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalInfo.java

@@ -0,0 +1,111 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 1.9.1	审批信息
+ * Created by Administrator on 2018/9/28.
+ */
+public class ApprovalInfo implements Serializable{
+    private static final long serialVersionUID = -3193902658627675444L;
+    private Integer approvalId;//
+    private String approvalName;//审批名称
+    private Integer approvalType;//审批订单类型 1:生产审批； 2:提货审批
+    private Integer approvalStatus;//1:待审批 2:已审批 3:已驳回 4:已完成部分审批 5:待入库 6:部分入库 7:全部入库 8:已发货
+    private String approvalStatusDetails;//状态文字描述 如:待 周新 审批
+    private Integer adminId;//申请人
+    private String approvalApplicant;//申请人姓名
+    private String activitiId;//activiti实例id
+    private String approvalDetails;//审批内容
+    private String approvalRemark;//备注信息
+    private Date approvalCreateTime;//申请时间
+
+    public Integer getApprovalId() {
+        return approvalId;
+    }
+
+    public void setApprovalId(Integer approvalId) {
+        this.approvalId = approvalId;
+    }
+
+    public String getApprovalName() {
+        return approvalName;
+    }
+
+    public void setApprovalName(String approvalName) {
+        this.approvalName = approvalName;
+    }
+
+    public Integer getApprovalType() {
+        return approvalType;
+    }
+
+    public void setApprovalType(Integer approvalType) {
+        this.approvalType = approvalType;
+    }
+
+    public Integer getApprovalStatus() {
+        return approvalStatus;
+    }
+
+    public void setApprovalStatus(Integer approvalStatus) {
+        this.approvalStatus = approvalStatus;
+    }
+
+    public String getApprovalStatusDetails() {
+        return approvalStatusDetails;
+    }
+
+    public void setApprovalStatusDetails(String approvalStatusDetails) {
+        this.approvalStatusDetails = approvalStatusDetails;
+    }
+
+    public Integer getAdminId() {
+        return adminId;
+    }
+
+    public void setAdminId(Integer adminId) {
+        this.adminId = adminId;
+    }
+
+    public String getApprovalApplicant() {
+        return approvalApplicant;
+    }
+
+    public void setApprovalApplicant(String approvalApplicant) {
+        this.approvalApplicant = approvalApplicant;
+    }
+
+    public String getActivitiId() {
+        return activitiId;
+    }
+
+    public void setActivitiId(String activitiId) {
+        this.activitiId = activitiId;
+    }
+
+    public String getApprovalDetails() {
+        return approvalDetails;
+    }
+
+    public void setApprovalDetails(String approvalDetails) {
+        this.approvalDetails = approvalDetails;
+    }
+
+    public String getApprovalRemark() {
+        return approvalRemark;
+    }
+
+    public void setApprovalRemark(String approvalRemark) {
+        this.approvalRemark = approvalRemark;
+    }
+
+    public Date getApprovalCreateTime() {
+        return approvalCreateTime;
+    }
+
+    public void setApprovalCreateTime(Date approvalCreateTime) {
+        this.approvalCreateTime = approvalCreateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalInventoryRecords.java

@@ -0,0 +1,109 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+
+/**
+ * Created by Administrator on 2018/9/29.
+ */
+public class ApprovalInventoryRecords implements Serializable {
+    private static final long serialVersionUID = -2060549066223267336L;
+    private Integer storageId;//
+    private Integer approvalId;//审批订单id
+    private Integer storageState;//入库状态
+    private Integer productId;//产品id
+    private String productName;//产品名称
+    private String colorName;//颜色名称
+    private Integer shouldStorage;//本次应入库数量
+    private Integer actualStorage;//实际入库数量
+    private Integer lackNumber;//入库后缺少数量
+    private Integer operatingAdminId;//操作人
+    private Integer operatingTime;//
+
+    public Integer getStorageId() {
+        return storageId;
+    }
+
+    public void setStorageId(Integer storageId) {
+        this.storageId = storageId;
+    }
+
+    public Integer getApprovalId() {
+        return approvalId;
+    }
+
+    public void setApprovalId(Integer approvalId) {
+        this.approvalId = approvalId;
+    }
+
+    public Integer getStorageState() {
+        return storageState;
+    }
+
+    public void setStorageState(Integer storageState) {
+        this.storageState = storageState;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getColorName() {
+        return colorName;
+    }
+
+    public void setColorName(String colorName) {
+        this.colorName = colorName;
+    }
+
+    public Integer getShouldStorage() {
+        return shouldStorage;
+    }
+
+    public void setShouldStorage(Integer shouldStorage) {
+        this.shouldStorage = shouldStorage;
+    }
+
+    public Integer getActualStorage() {
+        return actualStorage;
+    }
+
+    public void setActualStorage(Integer actualStorage) {
+        this.actualStorage = actualStorage;
+    }
+
+    public Integer getLackNumber() {
+        return lackNumber;
+    }
+
+    public void setLackNumber(Integer lackNumber) {
+        this.lackNumber = lackNumber;
+    }
+
+    public Integer getOperatingAdminId() {
+        return operatingAdminId;
+    }
+
+    public void setOperatingAdminId(Integer operatingAdminId) {
+        this.operatingAdminId = operatingAdminId;
+    }
+
+    public Integer getOperatingTime() {
+        return operatingTime;
+    }
+
+    public void setOperatingTime(Integer operatingTime) {
+        this.operatingTime = operatingTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalOrderInfo.java

@@ -1,193 +0,0 @@
-package com.iamberry.rst.core.approval;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 审批订单信息表
- * Created by Administrator on 2018/9/18.
- */
-public class ApprovalOrderInfo implements Serializable {
-    private static final long serialVersionUID = -6637217889680405558L;
-    private Integer approvalId;//
-    private String applicantName;//申请人姓名
-    private Integer applicantId;//申请人id
-    private String orderName;//订单名称
-    private Integer companyName;//客户公司名称
-    private String contactName;//客户联系人姓名
-    private String contactTel;//客户联系人电话
-    private Date deliveryTime;//期望交付时间
-    private String deliveryWay;//交付方式
-    private String contractName;//合同名称
-    private String contractImg;//合同图片
-    private String attachmentImg;//附件图片
-    private Integer approvalState;//审核状态1.待审核2.已审核.待入库 3.已入库 4.已拒绝5.已删除
-    private Integer currentAdminId;//当前审核人id（管理员id）
-    private String approvalDesc;//备注信息
-    private Date approvalCreateTime;//创建时间
-    private Date approvalUpdateTime;//修改时间
-    private List<ApprovalOrderItem> approvalOrderItemList;//审核订单项集合
-    private String adminName;//发起人姓名(发起人管理员姓名)
-    private String currentAdminName;//当前审核人姓名
-
-    public Integer getApprovalId() {
-        return approvalId;
-    }
-
-    public void setApprovalId(Integer approvalId) {
-        this.approvalId = approvalId;
-    }
-
-    public String getApplicantName() {
-        return applicantName;
-    }
-
-    public void setApplicantName(String applicantName) {
-        this.applicantName = applicantName;
-    }
-
-    public String getOrderName() {
-        return orderName;
-    }
-
-    public void setOrderName(String orderName) {
-        this.orderName = orderName;
-    }
-
-    public Integer getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(Integer companyName) {
-        this.companyName = companyName;
-    }
-
-    public String getContactName() {
-        return contactName;
-    }
-
-    public void setContactName(String contactName) {
-        this.contactName = contactName;
-    }
-
-    public String getContactTel() {
-        return contactTel;
-    }
-
-    public void setContactTel(String contactTel) {
-        this.contactTel = contactTel;
-    }
-
-    public Date getDeliveryTime() {
-        return deliveryTime;
-    }
-
-    public void setDeliveryTime(Date deliveryTime) {
-        this.deliveryTime = deliveryTime;
-    }
-
-    public String getDeliveryWay() {
-        return deliveryWay;
-    }
-
-    public void setDeliveryWay(String deliveryWay) {
-        this.deliveryWay = deliveryWay;
-    }
-
-    public String getContractName() {
-        return contractName;
-    }
-
-    public void setContractName(String contractName) {
-        this.contractName = contractName;
-    }
-
-    public String getContractImg() {
-        return contractImg;
-    }
-
-    public void setContractImg(String contractImg) {
-        this.contractImg = contractImg;
-    }
-
-    public String getAttachmentImg() {
-        return attachmentImg;
-    }
-
-    public void setAttachmentImg(String attachmentImg) {
-        this.attachmentImg = attachmentImg;
-    }
-
-    public Integer getApprovalState() {
-        return approvalState;
-    }
-
-    public void setApprovalState(Integer approvalState) {
-        this.approvalState = approvalState;
-    }
-
-    public Integer getCurrentAdminId() {
-        return currentAdminId;
-    }
-
-    public void setCurrentAdminId(Integer currentAdminId) {
-        this.currentAdminId = currentAdminId;
-    }
-
-    public String getApprovalDesc() {
-        return approvalDesc;
-    }
-
-    public void setApprovalDesc(String approvalDesc) {
-        this.approvalDesc = approvalDesc;
-    }
-
-    public Date getApprovalCreateTime() {
-        return approvalCreateTime;
-    }
-
-    public void setApprovalCreateTime(Date approvalCreateTime) {
-        this.approvalCreateTime = approvalCreateTime;
-    }
-
-    public Date getApprovalUpdateTime() {
-        return approvalUpdateTime;
-    }
-
-    public void setApprovalUpdateTime(Date approvalUpdateTime) {
-        this.approvalUpdateTime = approvalUpdateTime;
-    }
-
-    public List<ApprovalOrderItem> getApprovalOrderItemList() {
-        return approvalOrderItemList;
-    }
-
-    public void setApprovalOrderItemList(List<ApprovalOrderItem> approvalOrderItemList) {
-        this.approvalOrderItemList = approvalOrderItemList;
-    }
-
-    public Integer getApplicantId() {
-        return applicantId;
-    }
-
-    public void setApplicantId(Integer applicantId) {
-        this.applicantId = applicantId;
-    }
-
-    public String getAdminName() {
-        return adminName;
-    }
-
-    public void setAdminName(String adminName) {
-        this.adminName = adminName;
-    }
-
-    public String getCurrentAdminName() {
-        return currentAdminName;
-    }
-
-    public void setCurrentAdminName(String currentAdminName) {
-        this.currentAdminName = currentAdminName;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalOrderItem.java

@@ -1,84 +0,0 @@
-package com.iamberry.rst.core.approval;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 审批订单项表
- * Created by Administrator on 2018/9/18.
- */
-public class ApprovalOrderItem implements Serializable {
-    private static final long serialVersionUID = 6491512318998002598L;
-    private Integer itemId;//
-    private Integer approvalId;//审核订单id
-    private Integer productId;//产品id
-    private String productName;//产品名称
-    private String colorName;//颜色名称
-    private Integer productNum;//产品数量
-    private Date itemCreateTime;//创建时间
-    private Date itemUpdateTime;//修改时间
-
-    public Integer getItemId() {
-        return itemId;
-    }
-
-    public void setItemId(Integer itemId) {
-        this.itemId = itemId;
-    }
-
-    public Integer getApprovalId() {
-        return approvalId;
-    }
-
-    public void setApprovalId(Integer approvalId) {
-        this.approvalId = approvalId;
-    }
-
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public String getColorName() {
-        return colorName;
-    }
-
-    public void setColorName(String colorName) {
-        this.colorName = colorName;
-    }
-
-    public Integer getProductNum() {
-        return productNum;
-    }
-
-    public void setProductNum(Integer productNum) {
-        this.productNum = productNum;
-    }
-
-    public Date getItemCreateTime() {
-        return itemCreateTime;
-    }
-
-    public void setItemCreateTime(Date itemCreateTime) {
-        this.itemCreateTime = itemCreateTime;
-    }
-
-    public Date getItemUpdateTime() {
-        return itemUpdateTime;
-    }
-
-    public void setItemUpdateTime(Date itemUpdateTime) {
-        this.itemUpdateTime = itemUpdateTime;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalPeople.java

@@ -1,65 +0,0 @@
-package com.iamberry.rst.core.approval;
-
-import java.io.Serializable;
-
-/**
- * 审批人表
- * Created by Administrator on 2018/9/18.
- */
-public class ApprovalPeople implements Serializable{
-    private static final long serialVersionUID = -6699635149240250912L;
-    private Integer peopleId;//
-    private String approvalName;//审核人姓名
-    private Integer adminId;//审核人id（管理员id）
-    private Integer isFirst;//是否为第一级审批人
-    private Integer isLast;//是否为最后一级审批人
-    private Integer nextAdminId;//下一级审批人
-
-    public Integer getPeopleId() {
-        return peopleId;
-    }
-
-    public void setPeopleId(Integer peopleId) {
-        this.peopleId = peopleId;
-    }
-
-    public String getApprovalName() {
-        return approvalName;
-    }
-
-    public void setApprovalName(String approvalName) {
-        this.approvalName = approvalName;
-    }
-
-    public Integer getAdminId() {
-        return adminId;
-    }
-
-    public void setAdminId(Integer adminId) {
-        this.adminId = adminId;
-    }
-
-    public Integer getIsFirst() {
-        return isFirst;
-    }
-
-    public void setIsFirst(Integer isFirst) {
-        this.isFirst = isFirst;
-    }
-
-    public Integer getIsLast() {
-        return isLast;
-    }
-
-    public void setIsLast(Integer isLast) {
-        this.isLast = isLast;
-    }
-
-    public Integer getNextAdminId() {
-        return nextAdminId;
-    }
-
-    public void setNextAdminId(Integer nextAdminId) {
-        this.nextAdminId = nextAdminId;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalProduction.java

@@ -0,0 +1,156 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 1.9.2	生产审批信息表
+ * Created by Administrator on 2018/9/28.
+ */
+public class ApprovalProduction implements Serializable {
+    private Integer productionId;//
+    private Integer approvalId;//所属审批
+    private String applicantOrderNo;//订单编号*系统自动生成;了解生产规则
+    private String applicantName;//申请人姓名
+    private Integer applicantId;//申请人id
+    private String orderName;//订单名称
+    private String companyName;//客户公司名称
+    private String contactName;//客户联系人姓名
+    private String contactTel;//客户联系人电话
+    private Date productionDeliveryDate;//交付日期
+    private String productionDeliveryWay;//交付方式
+    private String productionDeliveryDesc;//交付备注
+    private Integer productionState;//审核状态 1:待审批2:已审批3:已驳回4:已完成部分审批5:待入库6:部分入库7:全部入库
+    private String productionPackingWay;//包装方式
+    private String productionRemark;//备注信息
+    private Date productionCreateTime;
+    private Date productionUpdateYime;
+
+    public Integer getApprovalId() {
+        return approvalId;
+    }
+
+    public void setApprovalId(Integer approvalId) {
+        this.approvalId = approvalId;
+    }
+
+    public String getApplicantOrderNo() {
+        return applicantOrderNo;
+    }
+
+    public void setApplicantOrderNo(String applicantOrderNo) {
+        this.applicantOrderNo = applicantOrderNo;
+    }
+
+    public String getApplicantName() {
+        return applicantName;
+    }
+
+    public void setApplicantName(String applicantName) {
+        this.applicantName = applicantName;
+    }
+
+    public Integer getApplicantId() {
+        return applicantId;
+    }
+
+    public void setApplicantId(Integer applicantId) {
+        this.applicantId = applicantId;
+    }
+
+    public String getOrderName() {
+        return orderName;
+    }
+
+    public void setOrderName(String orderName) {
+        this.orderName = orderName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getContactTel() {
+        return contactTel;
+    }
+
+    public void setContactTel(String contactTel) {
+        this.contactTel = contactTel;
+    }
+
+    public Date getProductionDeliveryDate() {
+        return productionDeliveryDate;
+    }
+
+    public void setProductionDeliveryDate(Date productionDeliveryDate) {
+        this.productionDeliveryDate = productionDeliveryDate;
+    }
+
+    public String getProductionDeliveryWay() {
+        return productionDeliveryWay;
+    }
+
+    public void setProductionDeliveryWay(String productionDeliveryWay) {
+        this.productionDeliveryWay = productionDeliveryWay;
+    }
+
+    public String getProductionDeliveryDesc() {
+        return productionDeliveryDesc;
+    }
+
+    public void setProductionDeliveryDesc(String productionDeliveryDesc) {
+        this.productionDeliveryDesc = productionDeliveryDesc;
+    }
+
+    public Integer getProductionState() {
+        return productionState;
+    }
+
+    public void setProductionState(Integer productionState) {
+        this.productionState = productionState;
+    }
+
+    public String getProductionPackingWay() {
+        return productionPackingWay;
+    }
+
+    public void setProductionPackingWay(String productionPackingWay) {
+        this.productionPackingWay = productionPackingWay;
+    }
+
+    public String getProductionRemark() {
+        return productionRemark;
+    }
+
+    public void setProductionRemark(String productionRemark) {
+        this.productionRemark = productionRemark;
+    }
+
+    public Date getProductionCreateTime() {
+        return productionCreateTime;
+    }
+
+    public void setProductionCreateTime(Date productionCreateTime) {
+        this.productionCreateTime = productionCreateTime;
+    }
+
+    public Date getProductionUpdateYime() {
+        return productionUpdateYime;
+    }
+
+    public void setProductionUpdateYime(Date productionUpdateYime) {
+        this.productionUpdateYime = productionUpdateYime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalProductionContract.java

@@ -0,0 +1,48 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 1.9.4	生产审批合同信息表
+ * Created by Administrator on 2018/9/28.
+ */
+public class ApprovalProductionContract implements Serializable {
+    private static final long serialVersionUID = -6409909802307248086L;
+    private Integer contractId;//
+    private Integer productionId;//生产id
+    private String contractUrl;//url
+    private Date contractCreateTime;
+
+    public Integer getContractId() {
+        return contractId;
+    }
+
+    public void setContractId(Integer contractId) {
+        this.contractId = contractId;
+    }
+
+    public Integer getProductionId() {
+        return productionId;
+    }
+
+    public void setProductionId(Integer productionId) {
+        this.productionId = productionId;
+    }
+
+    public String getContractUrl() {
+        return contractUrl;
+    }
+
+    public void setContractUrl(String contractUrl) {
+        this.contractUrl = contractUrl;
+    }
+
+    public Date getContractCreateTime() {
+        return contractCreateTime;
+    }
+
+    public void setContractCreateTime(Date contractCreateTime) {
+        this.contractCreateTime = contractCreateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalProductionItem.java

@@ -0,0 +1,120 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 1.9.3	生产审批产品表
+ * Created by Administrator on 2018/9/28.
+ */
+public class ApprovalProductionItem implements Serializable{
+    private static final long serialVersionUID = -2089892205893709276L;
+    private Integer itemId;//
+    private Integer productionId;//生产id
+    private Integer productId;//产品id
+    private String itemProductName;//产品名称
+    private String itemColorName;//颜色名称
+    private Integer itemProductNum;//产品数量
+    private String itemBrandName;//品牌名称
+    private String itemProductModel;//产品型号
+    private String itemProductUnit;//单位
+    private Integer itemProductBoxNumber;//箱数/套数
+    private Date itemCreateTime;
+    private Date itemUpdateTime;
+
+    public Integer getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Integer itemId) {
+        this.itemId = itemId;
+    }
+
+    public Integer getProductionId() {
+        return productionId;
+    }
+
+    public void setProductionId(Integer productionId) {
+        this.productionId = productionId;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public String getItemProductName() {
+        return itemProductName;
+    }
+
+    public void setItemProductName(String itemProductName) {
+        this.itemProductName = itemProductName;
+    }
+
+    public String getItemColorName() {
+        return itemColorName;
+    }
+
+    public void setItemColorName(String itemColorName) {
+        this.itemColorName = itemColorName;
+    }
+
+    public Integer getItemProductNum() {
+        return itemProductNum;
+    }
+
+    public void setItemProductNum(Integer itemProductNum) {
+        this.itemProductNum = itemProductNum;
+    }
+
+    public String getItemBrandName() {
+        return itemBrandName;
+    }
+
+    public void setItemBrandName(String itemBrandName) {
+        this.itemBrandName = itemBrandName;
+    }
+
+    public String getItemProductModel() {
+        return itemProductModel;
+    }
+
+    public void setItemProductModel(String itemProductModel) {
+        this.itemProductModel = itemProductModel;
+    }
+
+    public String getItemProductUnit() {
+        return itemProductUnit;
+    }
+
+    public void setItemProductUnit(String itemProductUnit) {
+        this.itemProductUnit = itemProductUnit;
+    }
+
+    public Integer getItemProductBoxNumber() {
+        return itemProductBoxNumber;
+    }
+
+    public void setItemProductBoxNumber(Integer itemProductBoxNumber) {
+        this.itemProductBoxNumber = itemProductBoxNumber;
+    }
+
+    public Date getItemCreateTime() {
+        return itemCreateTime;
+    }
+
+    public void setItemCreateTime(Date itemCreateTime) {
+        this.itemCreateTime = itemCreateTime;
+    }
+
+    public Date getItemUpdateTime() {
+        return itemUpdateTime;
+    }
+
+    public void setItemUpdateTime(Date itemUpdateTime) {
+        this.itemUpdateTime = itemUpdateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalRecord.java

@@ -4,27 +4,32 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 审批记录表
- * Created by Administrator on 2018/9/18.
+ * Created by Administrator on 2018/9/29.
  */
-public class ApprovalRecord implements Serializable {
-    private static final long serialVersionUID = -2586706898607985134L;
+public class HistoricalRecord implements Serializable {
+    private static final long serialVersionUID = 4110663412302723787L;
     private Integer recordId;//
-    private String approvalName;//审核人姓名
-    private Integer adminId;//审核人id（管理员id）
     private Integer approvalId;//审批订单id
-    private Integer recordState;//审核状态1 待审核 2. 审核通过 3,拒绝申请4.删除申请
+    private Integer adminId;//审批人id
+    private Integer recordState;//审核状态1：待审核2：审核通过3：驳回申请
+    private String taskId;//activiti任务id
     private Date approvalTime;//审核时间
-    private String approvalDesc;//审批备注
-    private Date recordCreateTime;//创建时间
-    private Date recordUpdateTime;//修改时间
+    private Date recordCreateTime;//
 
-    public String getApprovalName() {
-        return approvalName;
+    public Integer getRecordId() {
+        return recordId;
+    }
+
+    public void setRecordId(Integer recordId) {
+        this.recordId = recordId;
+    }
+
+    public Integer getApprovalId() {
+        return approvalId;
     }
 
-    public void setApprovalName(String approvalName) {
-        this.approvalName = approvalName;
+    public void setApprovalId(Integer approvalId) {
+        this.approvalId = approvalId;
     }
 
     public Integer getAdminId() {
@@ -43,20 +48,20 @@ public class ApprovalRecord implements Serializable {
         this.recordState = recordState;
     }
 
-    public Date getApprovalTime() {
-        return approvalTime;
+    public String getTaskId() {
+        return taskId;
     }
 
-    public void setApprovalTime(Date approvalTime) {
-        this.approvalTime = approvalTime;
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
     }
 
-    public String getApprovalDesc() {
-        return approvalDesc;
+    public Date getApprovalTime() {
+        return approvalTime;
     }
 
-    public void setApprovalDesc(String approvalDesc) {
-        this.approvalDesc = approvalDesc;
+    public void setApprovalTime(Date approvalTime) {
+        this.approvalTime = approvalTime;
     }
 
     public Date getRecordCreateTime() {
@@ -66,28 +71,4 @@ public class ApprovalRecord implements Serializable {
     public void setRecordCreateTime(Date recordCreateTime) {
         this.recordCreateTime = recordCreateTime;
     }
-
-    public Date getRecordUpdateTime() {
-        return recordUpdateTime;
-    }
-
-    public void setRecordUpdateTime(Date recordUpdateTime) {
-        this.recordUpdateTime = recordUpdateTime;
-    }
-
-    public Integer getRecordId() {
-        return recordId;
-    }
-
-    public void setRecordId(Integer recordId) {
-        this.recordId = recordId;
-    }
-
-    public Integer getApprovalId() {
-        return approvalId;
-    }
-
-    public void setApprovalId(Integer approvalId) {
-        this.approvalId = approvalId;
-    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ProcessInfo.java

@@ -0,0 +1,65 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by Administrator on 2018/9/29.
+ */
+public class ProcessInfo implements Serializable{
+    private static final long serialVersionUID = 52633936436129533L;
+    private Integer processId;//
+    private Integer approvalId;//审批订单id
+    private Integer adminId;//所属人
+    private String processDesc;//审批内容
+    private Integer processState;//审核状态0：评论1：待审核2：审核通过3：驳回申请4：删除申请
+    private Date processCreateTime;//
+
+    public Integer getProcessId() {
+        return processId;
+    }
+
+    public void setProcessId(Integer processId) {
+        this.processId = processId;
+    }
+
+    public Integer getApprovalId() {
+        return approvalId;
+    }
+
+    public void setApprovalId(Integer approvalId) {
+        this.approvalId = approvalId;
+    }
+
+    public Integer getAdminId() {
+        return adminId;
+    }
+
+    public void setAdminId(Integer adminId) {
+        this.adminId = adminId;
+    }
+
+    public String getProcessDesc() {
+        return processDesc;
+    }
+
+    public void setProcessDesc(String processDesc) {
+        this.processDesc = processDesc;
+    }
+
+    public Integer getProcessState() {
+        return processState;
+    }
+
+    public void setProcessState(Integer processState) {
+        this.processState = processState;
+    }
+
+    public Date getProcessCreateTime() {
+        return processCreateTime;
+    }
+
+    public void setProcessCreateTime(Date processCreateTime) {
+        this.processCreateTime = processCreateTime;
+    }
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/approval/ApplyPickItemService.java

@@ -1,7 +1,5 @@
 package com.iamberry.rst.faces.approval;
 
-import com.iamberry.rst.core.approval.ApplyPickItem;
-
 import java.util.List;
 
 /**
@@ -10,28 +8,5 @@ import java.util.List;
  * @Date 2018-09-19
  */
 public interface ApplyPickItemService {
-    /**
-     * 获取集合
-     * @param  applyPickItem
-     * @return List
-     */
-    List<ApplyPickItem> getApplyPickItemList(ApplyPickItem  applyPickItem);
-    /**
-     * 查询单条数据
-     * @param  id
-     * @return  applyPickItem
-     */
-    ApplyPickItem  getApplyPickItemById(Integer  id);
-    /**
-     * 增加数据
-     * @param  applyPickItem
-     * @return Integer
-     */
-    Integer  save(ApplyPickItem  applyPickItem);
-    /**
-     * 修改数据
-     * @param  applyPickItem
-     * @return Integer
-     */
-    Integer  update(ApplyPickItem  applyPickItem);
+
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/approval/ApplyPickService.java

@@ -1,6 +1,5 @@
 package com.iamberry.rst.faces.approval;
 
-import com.iamberry.rst.core.approval.ApplyPick;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 
@@ -12,36 +11,5 @@ import java.util.List;
  * @Date 2018-09-19
  */
 public interface ApplyPickService {
-    /**
-     * 获取集合
-     * @param  applyPick
-     * @return List
-     */
-    List<ApplyPick> getApplyPickList(ApplyPick  applyPick);
 
-    /**
-     * 分页集合
-     * @param pageRequest
-     * @return
-     */
-    PagedResult<ApplyPick> listApplyPickPage(PageRequest<ApplyPick> pageRequest);
-
-    /**
-     * 查询单条数据
-     * @param  id
-     * @return  applyPick
-     */
-    ApplyPick  getApplyPickById(Integer  id);
-    /**
-     * 增加数据
-     * @param  applyPick
-     * @return Integer
-     */
-    Integer  save(ApplyPick  applyPick);
-    /**
-     * 修改数据
-     * @param  applyPick
-     * @return Integer
-     */
-    Integer  update(ApplyPick  applyPick);
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/approval/ApprovalOrderService.java

@@ -1,10 +1,5 @@
 package com.iamberry.rst.faces.approval;
 
-import com.iamberry.rst.core.approval.ApplyPickItem;
-import com.iamberry.rst.core.approval.ApprovalOrderInfo;
-import com.iamberry.rst.core.approval.ApprovalOrderItem;
-import com.iamberry.rst.core.approval.ApprovalRecord;
-
 import java.util.List;
 
 /**
@@ -13,40 +8,5 @@ import java.util.List;
  * @Date 2018-09-19
  */
 public interface ApprovalOrderService {
-    /**
-     * 添加审批订单
-     * @return
-     */
-    int insert(ApprovalOrderInfo approvalOrderInfo);
 
-    /**
-     * 批量添加审批订单
-     * @return
-     */
-    int insertItem(List<ApprovalOrderItem> listApprovalOrderItem);
-    /**
-     * 添加审批记录
-     * @return
-     */
-    int insertRecord(ApprovalRecord approvalRecord);
-    /**
-     * 查询审批订单记录
-     * @return
-     */
-    List<ApprovalOrderInfo> listApprovalOrderInfo(ApprovalOrderInfo ApprovalOrderInfo);
-    /**
-     * 查询审批订单项记录
-     * @return
-     */
-    List<ApprovalOrderItem> listApprovalOrderItem(Integer approvalId);
-    /**
-     * 修改审批订单
-     * @return
-     */
-    int update(ApprovalOrderInfo ApprovalOrderInfo);
-    /**
-     * 删除订单项
-     * @return
-     */
-    int deleteItem(Integer approvalId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApplyPickItemServiceImpl.java

@@ -1,6 +1,5 @@
 package com.iamberry.rst.service.approval;
 
-import com.iamberry.rst.core.approval.ApplyPickItem;
 import com.iamberry.rst.faces.approval.ApplyPickItemService;
 import com.iamberry.rst.service.approval.mapper.ApplyPickItemMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,42 +14,5 @@ import java.util.List;
  */
 @Service
 public class ApplyPickItemServiceImpl  implements ApplyPickItemService {
-    @Autowired
-    private ApplyPickItemMapper applyPickItemMapper;
-    /**
-     * 获取集合
-     * @param  applyPickItem
-     * @return List
-     */
-    @Override
-    public List<ApplyPickItem> getApplyPickItemList(ApplyPickItem  applyPickItem){
-        return  applyPickItemMapper.getApplyPickItemList(applyPickItem);
-    }
-    /**
-     * 查询单条数据
-     * @param  id
-     * @return  applyPickItem
-     */
-    @Override
-    public  ApplyPickItem  getApplyPickItemById(Integer  id){
-        return  applyPickItemMapper.getApplyPickItemById(id);
-    }
-    /**
-     * 增加数据
-     * @param  applyPickItem
-     * @return Integer
-     */
-    @Override
-    public  Integer  save(ApplyPickItem  applyPickItem){
-        return  applyPickItemMapper.save(applyPickItem);
-    }
-    /**
-     * 修改数据
-     * @param  applyPickItem
-     * @return Integer
-     */
-    @Override
-    public  Integer  update(ApplyPickItem  applyPickItem){
-        return  applyPickItemMapper.update(applyPickItem);
-    }
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApplyPickServiceImpl.java

@@ -1,10 +1,8 @@
 package com.iamberry.rst.service.approval;
 
 import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.approval.ApplyPick;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
-import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.faces.approval.ApplyPickService;
 import com.iamberry.rst.service.approval.mapper.ApplyPickMapper;
 import com.iamberry.rst.util.PageUtil;
@@ -20,51 +18,5 @@ import java.util.List;
  */
 @Service
 public class ApplyPickServiceImpl  implements ApplyPickService {
-    @Autowired
-    private ApplyPickMapper applyPickMapper;
-    /**
-     * 获取集合
-     * @param  applyPick
-     * @return List
-     */
-    @Override
-    public List<ApplyPick> getApplyPickList(ApplyPick  applyPick){
-        return  applyPickMapper.getApplyPickList(applyPick);
-    }
 
-
-    @Override
-    public PagedResult<ApplyPick> listApplyPickPage(PageRequest<ApplyPick> pageRequest) {
-        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
-        List<ApplyPick> list = applyPickMapper.getApplyPickList(pageRequest.getData());
-        return PageUtil.getPage(list);
-    }
-
-    /**
-     * 查询单条数据
-     * @param  id
-     * @return  applyPick
-     */
-    @Override
-    public  ApplyPick  getApplyPickById(Integer  id){
-        return  applyPickMapper.getApplyPickById(id);
-    }
-    /**
-     * 增加数据
-     * @param  applyPick
-     * @return Integer
-     */
-    @Override
-    public  Integer  save(ApplyPick  applyPick){
-        return  applyPickMapper.save(applyPick);
-    }
-    /**
-     * 修改数据
-     * @param  applyPick
-     * @return Integer
-     */
-    @Override
-    public  Integer  update(ApplyPick  applyPick){
-        return  applyPickMapper.update(applyPick);
-    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApprovalOrderServiceImpl.java

@@ -1,12 +1,6 @@
 package com.iamberry.rst.service.approval;
 
-import com.iamberry.rst.core.approval.ApplyPickItem;
-import com.iamberry.rst.core.approval.ApprovalOrderInfo;
-import com.iamberry.rst.core.approval.ApprovalOrderItem;
-import com.iamberry.rst.core.approval.ApprovalRecord;
-import com.iamberry.rst.faces.approval.ApplyPickItemService;
 import com.iamberry.rst.faces.approval.ApprovalOrderService;
-import com.iamberry.rst.service.approval.mapper.ApplyPickItemMapper;
 import com.iamberry.rst.service.approval.mapper.ApprovalOrderMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,41 +14,5 @@ import java.util.List;
  */
 @Service
 public class ApprovalOrderServiceImpl implements ApprovalOrderService {
-    @Autowired
-    private ApprovalOrderMapper approvalOrderMapper;
 
-    @Override
-    public int insert(ApprovalOrderInfo approvalOrderInfo) {
-        return approvalOrderMapper.insert(approvalOrderInfo);
-    }
-
-    @Override
-    public int insertItem(List<ApprovalOrderItem> listApprovalOrderItem) {
-        return approvalOrderMapper.insertItem(listApprovalOrderItem);
-    }
-
-    @Override
-    public int insertRecord(ApprovalRecord approvalRecord) {
-        return approvalOrderMapper.insertRecord(approvalRecord);
-    }
-
-    @Override
-    public List<ApprovalOrderInfo> listApprovalOrderInfo(ApprovalOrderInfo ApprovalOrderInfo) {
-        return approvalOrderMapper.listApprovalOrderInfo(ApprovalOrderInfo);
-    }
-
-    @Override
-    public List<ApprovalOrderItem> listApprovalOrderItem(Integer approvalId) {
-        return approvalOrderMapper.listApprovalOrderItem(approvalId);
-    }
-
-    @Override
-    public int update(ApprovalOrderInfo ApprovalOrderInfo) {
-        return approvalOrderMapper.update(ApprovalOrderInfo);
-    }
-
-    @Override
-    public int deleteItem(Integer approvalId) {
-        return approvalOrderMapper.deleteItem(approvalId);
-    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/ApplyPickItemMapper.java

@@ -1,7 +1,5 @@
 package com.iamberry.rst.service.approval.mapper;
 
-import com.iamberry.rst.core.approval.ApplyPickItem;
-
 import java.util.List;
 
 /**
@@ -10,28 +8,5 @@ import java.util.List;
  * @Date 2018-09-19
  */
 public interface ApplyPickItemMapper {
-    /**
-     * 获取集合
-     * @param  applyPickItem
-     * @return List
-     */
-    List<ApplyPickItem> getApplyPickItemList(ApplyPickItem  applyPickItem);
-    /**
-     * 查询单条数据
-     * @param  id
-     * @return  applyPickItem
-     */
-    ApplyPickItem  getApplyPickItemById(Integer  id);
-    /**
-     * 增加数据
-     * @param  applyPickItem
-     * @return Integer
-     */
-    Integer  save(ApplyPickItem  applyPickItem);
-    /**
-     * 修改数据
-     * @param  applyPickItem
-     * @return Integer
-     */
-    Integer  update(ApplyPickItem  applyPickItem);
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/ApplyPickMapper.java

@@ -1,7 +1,5 @@
 package com.iamberry.rst.service.approval.mapper;
 
-import com.iamberry.rst.core.approval.ApplyPick;
-
 import java.util.List;
 
 /**
@@ -10,28 +8,5 @@ import java.util.List;
  * @Date 2018-09-19
  */
 public interface ApplyPickMapper {
-    /**
-     * 获取集合
-     * @param  applyPick
-     * @return List
-     */
-    List<ApplyPick> getApplyPickList(ApplyPick  applyPick);
-    /**
-     * 查询单条数据
-     * @param  id
-     * @return  applyPick
-     */
-    ApplyPick  getApplyPickById(Integer  id);
-    /**
-     * 增加数据
-     * @param  applyPick
-     * @return Integer
-     */
-    Integer  save(ApplyPick  applyPick);
-    /**
-     * 修改数据
-     * @param  applyPick
-     * @return Integer
-     */
-    Integer  update(ApplyPick  applyPick);
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/ApprovalOrderMapper.java

@@ -1,10 +1,6 @@
 package com.iamberry.rst.service.approval.mapper;
 
 
-import com.iamberry.rst.core.approval.ApprovalOrderInfo;
-import com.iamberry.rst.core.approval.ApprovalOrderItem;
-import com.iamberry.rst.core.approval.ApprovalRecord;
-
 import java.util.List;
 
 /**
@@ -12,40 +8,5 @@ import java.util.List;
  */
 public interface ApprovalOrderMapper {
 
-    /**
-     * 添加审批订单
-     * @return
-     */
-    int insert(ApprovalOrderInfo approvalOrderInfo);
 
-    /**
-     * 批量添加审批订单
-     * @return
-     */
-    int insertItem(List<ApprovalOrderItem> listApprovalOrderItem);
-    /**
-     * 添加审批记录
-     * @return
-     */
-    int insertRecord(ApprovalRecord approvalRecord);
-    /**
-     * 查询审批订单记录
-     * @return
-     */
-    List<ApprovalOrderInfo> listApprovalOrderInfo(ApprovalOrderInfo ApprovalOrderInfo);
-    /**
-     * 查询审批订单项记录
-     * @return
-     */
-    List<ApprovalOrderItem> listApprovalOrderItem(Integer approvalId);
-    /**
-     * 修改审批订单
-     * @return
-     */
-    int update(ApprovalOrderInfo ApprovalOrderInfo);
-    /**
-     * 删除订单项
-     * @return
-     */
-    int deleteItem(Integer approvalId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml

@@ -1,7 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.iamberry.rst.service.approval.mapper.ApprovalOrderMapper" >
-  <resultMap id="BaseResultMap" type="ApprovalOrderInfo" >
+
+  <resultMap id="ApprovalInfoResultMap" type="ApprovalInfo" >
+    <id column="approval_id" property="approvalId" jdbcType="INTEGER" />
+    <result column="approval_name" property="approvalName" jdbcType="VARCHAR" />
+    <result column="approval_type" property="approvalType" jdbcType="INTEGER" />
+    <result column="approval_status" property="approvalStatus" jdbcType="INTEGER" />
+    <result column="approval_status_details" property="approvalStatusDetails" jdbcType="VARCHAR" />
+    <result column="admin_id" property="adminId" jdbcType="INTEGER" />
+    <result column="approval_applicant" property="approvalApplicant" jdbcType="VARCHAR" />
+    <result column="activiti_id" property="activitiId" jdbcType="INTEGER" />
+    <result column="approval_details" property="approvalDetails" jdbcType="VARCHAR" />
+    <result column="approval_remark" property="approvalRemark" jdbcType="VARCHAR" />
+    <result column="approval_create_time" property="approvalCreateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <resultMap id="ApprovalProductionResultMap" type="ApprovalProduction" >
+    <id column="production_id" property="productionId" jdbcType="INTEGER" />
+    <result column="approval_id" property="approvalId" jdbcType="VARCHAR" />
+    <result column="applicant_order_no" property="applicantOrderNo" jdbcType="VARCHAR" />
+    <result column="applicant_name" property="applicantName" jdbcType="VARCHAR" />
+    <result column="applicant_id" property="applicantId" jdbcType="INTEGER" />
+    <result column="order_name" property="orderName" jdbcType="VARCHAR" />
+    <result column="company_name" property="companyName" jdbcType="VARCHAR" />
+    <result column="contact_name" property="contactName" jdbcType="VARCHAR" />
+    <result column="contact_tel" property="contactTel" jdbcType="VARCHAR" />
+    <result column="production_delivery_date" property="productionDeliveryDate" jdbcType="DATE" />
+    <result column="production_delivery_way" property="productionDeliveryWay" jdbcType="VARCHAR" />
+    <result column="production_delivery_desc" property="productionDeliveryDesc" jdbcType="VARCHAR" />
+    <result column="production_state" property="productionState" jdbcType="INTEGER" />
+    <result column="production_packing_way" property="productionPackingWay" jdbcType="VARCHAR" />
+    <result column="production_remark" property="productionRemark" jdbcType="VARCHAR" />
+    <result column="production_create_time" property="productionCreateTime" jdbcType="TIMESTAMP" />
+    <result column="production_update_time" property="productionUpdateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+
+
+
+ <!-- <resultMap id="BaseResultMap" type="ApprovalOrderInfo" >
     <id column="approval_id" property="approvalId" jdbcType="INTEGER" />
     <result column="applicant_name" property="applicantName" jdbcType="VARCHAR" />
     <result column="applicant_id" property="applicantId" jdbcType="INTEGER" />
@@ -49,7 +85,7 @@
     ,#{contractName},#{contractImg},#{attachmentImg},#{approvalState}
     ,#{currentAdminId},#{approvalDesc},NOW())
 </insert>
-  <!-- 批量添加订单项数据 -->
+  &lt;!&ndash; 批量添加订单项数据 &ndash;&gt;
   <insert id="insertItem" parameterType="ArrayList">
     INSERT INTO tb_rst_approval_order_item
     (
@@ -179,5 +215,5 @@
 
   <delete id="deleteItem" parameterType="Integer">
     DELETE FROM tb_rst_approval_order_item where approval_id = #{approvalId}
-  </delete>
+  </delete>-->
 </mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -991,12 +991,14 @@
             t.*,
             soi.*,
             trsc.company_name companyName,
-            si.store_name storeName
+            si.store_name storeName,
+            ci.customer_is_solve customerIsSolve
         FROM
             tb_rst_sales_order_info t
         LEFT JOIN tb_rst_sales_company trsc ON t.sales_company_id = trsc.company_id
         LEFT JOIN tb_rst_store_info si ON t.sales_store_id = si.store_id
         LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
+        LEFT JOIN tb_rst_customer_info ci ON t.sales_customer_id = ci.customer_id
       <where>
             t.sales_batch_id != 'KS00000000000001'
           <if test="salesIsDownload !=null ">

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApplyPickController.java

@@ -1,6 +1,5 @@
 package com.iamberry.rst.controllers.approval;
 
-import com.iamberry.rst.core.approval.ApplyPick;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.faces.approval.ApplyPickItemService;
@@ -23,7 +22,7 @@ public class ApplyPickController {
     @Autowired
     private ApplyPickItemService applyPickItemService;
 
-    /**
+   /* *//**
      *
      * @param applyPick
      * @param pageSize
@@ -31,7 +30,7 @@ public class ApplyPickController {
      * @param totalNum
      * @return
      * @throws Exception
-     */
+     *//*
     @ResponseBody
     @RequestMapping(value = "/applyPickList")
     public ResponseJson listApplyPickPage(
@@ -75,6 +74,6 @@ public class ApplyPickController {
         return rj;
     }
 
-
+*/
 
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -13,9 +13,11 @@ import com.iamberry.rst.core.sms.OrderMessage;
 import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.core.sys.OrderCheckStatus;
 import com.iamberry.rst.core.sys.Relu;
+import com.iamberry.rst.core.tools.LogisticsInfo;
 import com.iamberry.rst.faces.cm.SalesOrderService;
 import com.iamberry.rst.faces.cm.StoreInfoService;
 import com.iamberry.rst.faces.order.EfastOrderService;
+import com.iamberry.rst.faces.order.LogisticsInfoService;
 import com.iamberry.rst.faces.order.OrderBatchService;
 import com.iamberry.rst.faces.order.OrderService;
 import com.iamberry.rst.faces.product.ProductService;
@@ -27,7 +29,6 @@ import com.iamberry.rst.utils.ExcelUtil;
 import com.iamberry.rst.utils.GenerateKeyUtil;
 import com.iamberry.rst.utils.OrderNoUtil;
 import com.iamberry.wechat.tools.DateTimeUtil;
-import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ObjectExcelView;
 import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.payUtil.DatetimeUtil;
@@ -88,6 +89,8 @@ public class AdminOrderController {
     private StoreInfoService storeInfoService;
     @Autowired
     private OrderBatchService orderBatchService;
+    @Autowired
+    private LogisticsInfoService logisticsInfoService;
 
     @Autowired
     private ExcelUtil excelUtil;
@@ -763,6 +766,7 @@ public class AdminOrderController {
         List<String> titles = new ArrayList<String>();
         titles.add("订单编号");
         titles.add("Efast交易号");
+        titles.add("订单类型");
         titles.add("收货人");
         titles.add("收货人电话");
         titles.add("收货人地址");
@@ -791,6 +795,43 @@ public class AdminOrderController {
                 row.add(efastOrder.getOrderNum() == null ? null:efastOrder.getOrderNum());*/
                 row.add(salesOrder.getSalesOrderId() == null ? null:salesOrder.getSalesOrderId());
                 row.add(salesOrder.getSalesDealCode() == null ? null:salesOrder.getSalesDealCode());
+
+
+                if(salesOrder.getSalesCustomerId() == null){
+                    row.add("正常订单");
+                }else{
+                    if(salesOrder.getCustomerIsSolve() == null){
+                        row.add("售后订单");
+                    }else{
+                        switch (salesOrder.getCustomerIsSolve()){
+                            case 1:
+                                row.add("售后订单（已解决）");
+                                break;
+                            case 2:
+                                row.add("售后订单（未解决）");
+                                break;
+                            case 3:
+                                row.add("售后订单（换新）");
+                                break;
+                            case 4:
+                                row.add("售后订单（维修）");
+                                break;
+                            case 5:
+                                row.add("售后订单（补发）");
+                                break;
+                            case 6:
+                                row.add("售后订单（退货）");
+                                break;
+                            case 7:
+                                row.add("售后订单（无理由退货）");
+                                break;
+                            default:
+                                row.add("售后订单");
+                                break;
+                        }
+                    }
+
+                }
                 row.add(salesOrder.getSalesAddressName() == null ? null:salesOrder.getSalesAddressName());
                 row.add(salesOrder.getSalesAddressTel() == null ? null:salesOrder.getSalesAddressTel());
                 row.add(salesOrder.getSalesAddressInfo() == null ? null:salesOrder.getSalesAddressInfo());
@@ -858,73 +899,18 @@ public class AdminOrderController {
     }
 
     /**物流名称替换**/
-    public static String replace(String code) {
+    public String replace(String code) {
         String name = "";
         if(code == null || "".equals(code)){
             return "";
         }
-        switch (code){
-            case "sto":
-                name= "申通快递";
-                break;
-            case "yto":
-                name= "圆通快递";
-                break;
-            case "zto":
-                name= "中通速递";
-                break;
-            case "sf":
-                name= "顺丰快递";
-                break;
-            case "ems":
-                name= "邮政EMS";
-                break;
-            case "eyb":
-                name= "省外EMS";
-                break;
-            case "zjs":
-                name= "宅急送";
-                break;
-            case "yunda":
-                name= "韵达快递";
-                break;
-            case "cces":
-                name= "cces快递";
-                break;
-            case "pick":
-                name= "上门提货";
-                break;
-            case "htky":
-                name= "汇通快递";
-                break;
-            case "ttkdex":
-                name= "天天快递";
-                break;
-            case "stars":
-                name= "星晨急便";
-                break;
-            case "jd":
-                name= "京东快递";
-                break;
-            case "01":
-                name= "其他";
-                break;
-            case "02":
-                name= "上门送货";
-                break;
-            case "longbanwuliu":
-                name= "龙邦快递";
-                break;
-            case "YZPY":
-                name= "省外EMS";
-                break;
-            case "EYB":
-                name= "省外EMS";
-                break;
-            default:
-                break;
+        List<LogisticsInfo> logisticsInfoList = logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
+        for (LogisticsInfo logistics:logisticsInfoList) {
+            if(code .equalsIgnoreCase(logistics.getLogisticsRstCode())){
+                return logistics.getLogisticsName();
+            }
         }
-        return name;
+        return "";
     }
 
     @ResponseBody

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -218,10 +218,10 @@ public class AwaitSendController {
 
         // 获取收件人邮编
         String PostCode = AddrUtil.getPostCode(addrs[2]);
-        if (PostCode == null) {
+        if (PostCode == null || "".equals(PostCode)) {
             PostCode = AddrUtil.getPostCode(addrs[1]);
         }
-        if (PostCode == null) {
+        if (PostCode == null || "".equals(PostCode)) {
             PostCode = AddrUtil.getPostCode(addrs[0]);
         }
 

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -115,12 +115,12 @@
 		<typeAlias type="com.iamberry.rst.core.cm.WarehouseInfo" alias="WarehouseInfo"/>
 		<typeAlias type="com.iamberry.rst.core.cm.FactoryInfo" alias="FactoryInfo"/>
 		<!-- 审批实体类 -->
-		<typeAlias type="com.iamberry.rst.core.approval.ApprovalOrderInfo" alias="ApprovalOrderInfo"/>
+		<!--<typeAlias type="com.iamberry.rst.core.approval.ApprovalOrderInfo" alias="ApprovalOrderInfo"/>
 		<typeAlias type="com.iamberry.rst.core.approval.ApprovalOrderItem" alias="ApprovalOrderItem"/>
 		<typeAlias type="com.iamberry.rst.core.approval.ApprovalPeople" alias="ApprovalPeople"/>
 		<typeAlias type="com.iamberry.rst.core.approval.ApprovalRecord" alias="ApprovalRecord"/>
 		<typeAlias type="com.iamberry.rst.core.approval.ApplyPick" alias="ApplyPick"/>
-		<typeAlias type="com.iamberry.rst.core.approval.ApplyPickItem" alias="ApplyPickItem"/>
+		<typeAlias type="com.iamberry.rst.core.approval.ApplyPickItem" alias="ApplyPickItem"/>-->
 	</typeAliases>
 	<!-- PageHelper -->
 	<plugins>
@@ -192,8 +192,8 @@
 		<mapper resource="com/iamberry/rst/service/cm/mapper/inventoryLogMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/cm/mapper/inventoryMapper.xml"/>
 
-		<mapper resource="com/iamberry/rst/service/approval/mapper/applyPickItemMapper.xml"/>
+		<!--<mapper resource="com/iamberry/rst/service/approval/mapper/applyPickItemMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/approval/mapper/applyPickMapper.xml"/>
-		<mapper resource="com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml"/>-->
 	</mappers>
 </configuration>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

@@ -180,28 +180,27 @@
                 var barcodes = $("#bcTarget").html();
                 /*$("#barcodeId").html(machineBarcode);
                 $("#qrcodeImg").attr('src',machineQrcode);*/
-                /* if (machineProduceType == 1) {//净水机模板*/
+                if (produceName.indexOf("富氢") != -1 || produceName.indexOf("诺米克") != -1) {
                 $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                        '<span style="position: absolute;left: 10px;font-size: 14px;">桌面净水机</span>' +
+                        '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
                         '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
                         '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
                         '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
                         '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
-                        '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                        '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px; display: none;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
                         '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
                         '</div>');
-                /*}*/
-                /*if (machineProduceType == 2) {//冲奶机模板
+                }else{
                     $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                            '<span style="position: absolute;left: 10px;font-size: 14px;">'+produceName+'</span>' +
-                            '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                            '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;">S／N</span>' +
-                            '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
-                            '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
-                            '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                            '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ machineNo +'</span>' +
-                            '</div>');
-                }*/
+                        '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
+                        '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                        '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
+                        '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
+                        '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
+                        '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                        '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
+                        '</div>');
+                }
                 if(${machineIsPrint} == '1')
                 {
                     updatePrint(machineBarcode,false);
@@ -355,28 +354,27 @@
             code128(machineBarcode);
             var barcodes = $("#bcTarget").html();
 
-            /*if(machineProduceType == 1){//净水机模板*/
-            $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                    '<span style="position: absolute;left: 10px;font-size: 14px;">桌面净水机</span>' +
-                    '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                    '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
-                    '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
-                    '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
-                    '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                    '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
-                    '</div>');
-            /*}*/
-            /*if(machineProduceType == 2){//冲奶机模板
+            if (produceName.indexOf("富氢") != -1 || produceName.indexOf("诺米克") != -1) {
+                $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
+                        '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
+                        '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                        '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
+                        '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
+                        '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
+                        '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px; display: none;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                        '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
+                        '</div>');
+            }else{
                 $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                        '<span style="position: absolute;left: 10px;font-size: 14px;">'+produceName+'</span>' +
-                        '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                        '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;">S／N</span>' +
+                        '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
+                        '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                        '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
                         '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
                         '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
                         '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                        '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ machineNo +'</span>' +
+                        '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
                         '</div>');
-            }*/
+            }
 
         }
         if(settingNumber > 24){