pts批次，bom单，机器版本类添加

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsBatch.java

@@ -0,0 +1,121 @@
+package com.iamberry.rst.core.pts;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 生产批次类
+ */
+public class PtsBatch implements Serializable{
+    private static final long serialVersionUID = -5739697681705907274L;
+
+    private Integer batchId;//批次id
+
+    private String batchNo;//批次编号
+
+    private Integer batchQuantity;//批次数量
+
+    private Integer bomId;//bom单id
+
+    private Integer produceId;//产品id
+
+    private Integer batchSoftwareVersionId;//软件版本
+
+    private Integer batchHardwareVersionId;//硬件版本
+
+    private Integer batchStatus;//批次状态：0：停止使用；1：正常使用；
+
+    private String batchDesc;//批次描述
+
+    private Date batchCreateTime;//创建时间
+
+    private Date batchUpdateTime;//更新时间
+
+    public Integer getBatchId() {
+        return batchId;
+    }
+
+    public void setBatchId(Integer batchId) {
+        this.batchId = batchId;
+    }
+
+    public String getBatchNo() {
+        return batchNo;
+    }
+
+    public void setBatchNo(String batchNo) {
+        this.batchNo = batchNo;
+    }
+
+    public Integer getBatchQuantity() {
+        return batchQuantity;
+    }
+
+    public void setBatchQuantity(Integer batchQuantity) {
+        this.batchQuantity = batchQuantity;
+    }
+
+    public Integer getBomId() {
+        return bomId;
+    }
+
+    public void setBomId(Integer bomId) {
+        this.bomId = bomId;
+    }
+
+    public Integer getProduceId() {
+        return produceId;
+    }
+
+    public void setProduceId(Integer produceId) {
+        this.produceId = produceId;
+    }
+
+    public Integer getBatchSoftwareVersionId() {
+        return batchSoftwareVersionId;
+    }
+
+    public void setBatchSoftwareVersionId(Integer batchSoftwareVersionId) {
+        this.batchSoftwareVersionId = batchSoftwareVersionId;
+    }
+
+    public Integer getBatchHardwareVersionId() {
+        return batchHardwareVersionId;
+    }
+
+    public void setBatchHardwareVersionId(Integer batchHardwareVersionId) {
+        this.batchHardwareVersionId = batchHardwareVersionId;
+    }
+
+    public Integer getBatchStatus() {
+        return batchStatus;
+    }
+
+    public void setBatchStatus(Integer batchStatus) {
+        this.batchStatus = batchStatus;
+    }
+
+    public String getBatchDesc() {
+        return batchDesc;
+    }
+
+    public void setBatchDesc(String batchDesc) {
+        this.batchDesc = batchDesc;
+    }
+
+    public Date getBatchCreateTime() {
+        return batchCreateTime;
+    }
+
+    public void setBatchCreateTime(Date batchCreateTime) {
+        this.batchCreateTime = batchCreateTime;
+    }
+
+    public Date getBatchUpdateTime() {
+        return batchUpdateTime;
+    }
+
+    public void setBatchUpdateTime(Date batchUpdateTime) {
+        this.batchUpdateTime = batchUpdateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsBom.java

@@ -0,0 +1,71 @@
+package com.iamberry.rst.core.pts;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * bom单管理
+ */
+public class PtsBom implements Serializable{
+    private static final long serialVersionUID = -1841049934073982721L;
+
+    private Integer bomId;//bom单id
+
+    private String bomName;//bom单名称
+
+    private Integer produceId;//产品id
+
+    private String bomRemarks;//备注
+
+    private Date bomCreateTime;//创建时间
+
+    private Date bomUpdateTime;//修改时间
+
+    public Integer getBomId() {
+        return bomId;
+    }
+
+    public void setBomId(Integer bomId) {
+        this.bomId = bomId;
+    }
+
+    public String getBomName() {
+        return bomName;
+    }
+
+    public void setBomName(String bomName) {
+        this.bomName = bomName;
+    }
+
+    public Integer getProduceId() {
+        return produceId;
+    }
+
+    public void setProduceId(Integer produceId) {
+        this.produceId = produceId;
+    }
+
+    public String getBomRemarks() {
+        return bomRemarks;
+    }
+
+    public void setBomRemarks(String bomRemarks) {
+        this.bomRemarks = bomRemarks;
+    }
+
+    public Date getBomCreateTime() {
+        return bomCreateTime;
+    }
+
+    public void setBomCreateTime(Date bomCreateTime) {
+        this.bomCreateTime = bomCreateTime;
+    }
+
+    public Date getBomUpdateTime() {
+        return bomUpdateTime;
+    }
+
+    public void setBomUpdateTime(Date bomUpdateTime) {
+        this.bomUpdateTime = bomUpdateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsBomComponents.java

@@ -0,0 +1,50 @@
+package com.iamberry.rst.core.pts;
+
+import java.io.Serializable;
+
+/**
+ * bom单与零件清单关联表
+ */
+public class PtsBomComponents implements Serializable{
+    private static final long serialVersionUID = -7256868929441595890L;
+
+    private Integer bomComponentsId;//id
+
+    private Integer bomId;//bom单
+
+    private Integer componentsId;//零件id
+
+    private Integer bomComponentsQuantity;//零件数量
+
+    public Integer getBomComponentsId() {
+        return bomComponentsId;
+    }
+
+    public void setBomComponentsId(Integer bomComponentsId) {
+        this.bomComponentsId = bomComponentsId;
+    }
+
+    public Integer getBomId() {
+        return bomId;
+    }
+
+    public void setBomId(Integer bomId) {
+        this.bomId = bomId;
+    }
+
+    public Integer getComponentsId() {
+        return componentsId;
+    }
+
+    public void setComponentsId(Integer componentsId) {
+        this.componentsId = componentsId;
+    }
+
+    public Integer getBomComponentsQuantity() {
+        return bomComponentsQuantity;
+    }
+
+    public void setBomComponentsQuantity(Integer bomComponentsQuantity) {
+        this.bomComponentsQuantity = bomComponentsQuantity;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsComponents.java

@@ -0,0 +1,171 @@
+package com.iamberry.rst.core.pts;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 零件管理
+ */
+public class PtsComponents implements Serializable {
+    private static final long serialVersionUID = 8230192487571588873L;
+
+    private Integer componentsId;//id
+
+    private Integer supplierId;//供应商id
+
+    private Integer produceId;//产品id
+
+    private String componentsNo;//零件编号
+
+    private String componentsName;//零件名称
+
+    private Integer componentsType;//零件类型：1：塑胶件；2：五金件；3：其他；
+
+    private Integer componentsCost;//零件成本（分）
+
+    private Integer componentsWeight;//零件重量（g）
+
+    private String componentsMaterial;//材料
+
+    private String componentsMbsc;//mbsc
+
+    private String componentsSpecification;//规格
+
+    private String componentsImg;//
+
+    private Integer componentsStatus;//状态 0：停止使用；1：正常使用；
+
+    private String componentsDesc;//备注
+
+    private Date componentsCreateTime;//创建时间
+
+    private Date componentsUpdateTime;//修改时间
+
+    public Integer getComponentsId() {
+        return componentsId;
+    }
+
+    public void setComponentsId(Integer componentsId) {
+        this.componentsId = componentsId;
+    }
+
+    public Integer getSupplierId() {
+        return supplierId;
+    }
+
+    public void setSupplierId(Integer supplierId) {
+        this.supplierId = supplierId;
+    }
+
+    public Integer getProduceId() {
+        return produceId;
+    }
+
+    public void setProduceId(Integer produceId) {
+        this.produceId = produceId;
+    }
+
+    public String getComponentsNo() {
+        return componentsNo;
+    }
+
+    public void setComponentsNo(String componentsNo) {
+        this.componentsNo = componentsNo;
+    }
+
+    public String getComponentsName() {
+        return componentsName;
+    }
+
+    public void setComponentsName(String componentsName) {
+        this.componentsName = componentsName;
+    }
+
+    public Integer getComponentsType() {
+        return componentsType;
+    }
+
+    public void setComponentsType(Integer componentsType) {
+        this.componentsType = componentsType;
+    }
+
+    public Integer getComponentsCost() {
+        return componentsCost;
+    }
+
+    public void setComponentsCost(Integer componentsCost) {
+        this.componentsCost = componentsCost;
+    }
+
+    public Integer getComponentsWeight() {
+        return componentsWeight;
+    }
+
+    public void setComponentsWeight(Integer componentsWeight) {
+        this.componentsWeight = componentsWeight;
+    }
+
+    public String getComponentsMaterial() {
+        return componentsMaterial;
+    }
+
+    public void setComponentsMaterial(String componentsMaterial) {
+        this.componentsMaterial = componentsMaterial;
+    }
+
+    public String getComponentsMbsc() {
+        return componentsMbsc;
+    }
+
+    public void setComponentsMbsc(String componentsMbsc) {
+        this.componentsMbsc = componentsMbsc;
+    }
+
+    public String getComponentsSpecification() {
+        return componentsSpecification;
+    }
+
+    public void setComponentsSpecification(String componentsSpecification) {
+        this.componentsSpecification = componentsSpecification;
+    }
+
+    public String getComponentsImg() {
+        return componentsImg;
+    }
+
+    public void setComponentsImg(String componentsImg) {
+        this.componentsImg = componentsImg;
+    }
+
+    public Integer getComponentsStatus() {
+        return componentsStatus;
+    }
+
+    public void setComponentsStatus(Integer componentsStatus) {
+        this.componentsStatus = componentsStatus;
+    }
+
+    public String getComponentsDesc() {
+        return componentsDesc;
+    }
+
+    public void setComponentsDesc(String componentsDesc) {
+        this.componentsDesc = componentsDesc;
+    }
+
+    public Date getComponentsCreateTime() {
+        return componentsCreateTime;
+    }
+
+    public void setComponentsCreateTime(Date componentsCreateTime) {
+        this.componentsCreateTime = componentsCreateTime;
+    }
+
+    public Date getComponentsUpdateTime() {
+        return componentsUpdateTime;
+    }
+
+    public void setComponentsUpdateTime(Date componentsUpdateTime) {
+        this.componentsUpdateTime = componentsUpdateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsMachineVersion.java

@@ -0,0 +1,91 @@
+package com.iamberry.rst.core.pts;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 机器版本管理
+ */
+public class PtsMachineVersion implements Serializable {
+    private static final long serialVersionUID = -4430484766113357645L;
+
+    private Integer machineVersionId;//软硬件版本id
+
+    private Integer produceId;//产品id
+
+    private String machineVersionNo;//版本号
+
+    private String machineVersionName;//版本名称
+
+    private String machineVersionContent;//更新内容
+
+    private Integer machineVersionType;//版本类型 1：硬件版本； 2：软件版本
+
+    private Date machineVersionCreateTime;//创建时间
+
+    private Date machineVersionUpdateTime;//修改时间
+
+    public Integer getMachineVersionId() {
+        return machineVersionId;
+    }
+
+    public void setMachineVersionId(Integer machineVersionId) {
+        this.machineVersionId = machineVersionId;
+    }
+
+    public Integer getProduceId() {
+        return produceId;
+    }
+
+    public void setProduceId(Integer produceId) {
+        this.produceId = produceId;
+    }
+
+    public String getMachineVersionNo() {
+        return machineVersionNo;
+    }
+
+    public void setMachineVersionNo(String machineVersionNo) {
+        this.machineVersionNo = machineVersionNo;
+    }
+
+    public String getMachineVersionName() {
+        return machineVersionName;
+    }
+
+    public void setMachineVersionName(String machineVersionName) {
+        this.machineVersionName = machineVersionName;
+    }
+
+    public String getMachineVersionContent() {
+        return machineVersionContent;
+    }
+
+    public void setMachineVersionContent(String machineVersionContent) {
+        this.machineVersionContent = machineVersionContent;
+    }
+
+    public Integer getMachineVersionType() {
+        return machineVersionType;
+    }
+
+    public void setMachineVersionType(Integer machineVersionType) {
+        this.machineVersionType = machineVersionType;
+    }
+
+    public Date getMachineVersionCreateTime() {
+        return machineVersionCreateTime;
+    }
+
+    public void setMachineVersionCreateTime(Date machineVersionCreateTime) {
+        this.machineVersionCreateTime = machineVersionCreateTime;
+    }
+
+    public Date getMachineVersionUpdateTime() {
+        return machineVersionUpdateTime;
+    }
+
+    public void setMachineVersionUpdateTime(Date machineVersionUpdateTime) {
+        this.machineVersionUpdateTime = machineVersionUpdateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsSupplier.java

@@ -0,0 +1,111 @@
+package com.iamberry.rst.core.pts;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 供应商管理
+ */
+public class PtsSupplier implements Serializable {
+    private static final long serialVersionUID = -2432284826191496888L;
+
+    private Integer supplierId;//供应商id
+
+    private String supplierName;//供应商名称
+
+    private String supplierAbbreviation;//简称
+
+    private String supplierAddress;//地址
+
+    private String supplierContactPerson;//联系人姓名
+
+    private String supplierTel;//联系人电话
+
+    private String supplierPhone;//座机
+
+    private String supplierEmail;//邮箱
+
+    private Date supplierCreateTime;//创建时间
+
+    private Date supplierUpdateTime;//修改时间
+
+    public Integer getSupplierId() {
+        return supplierId;
+    }
+
+    public void setSupplierId(Integer supplierId) {
+        this.supplierId = supplierId;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getSupplierAbbreviation() {
+        return supplierAbbreviation;
+    }
+
+    public void setSupplierAbbreviation(String supplierAbbreviation) {
+        this.supplierAbbreviation = supplierAbbreviation;
+    }
+
+    public String getSupplierAddress() {
+        return supplierAddress;
+    }
+
+    public void setSupplierAddress(String supplierAddress) {
+        this.supplierAddress = supplierAddress;
+    }
+
+    public String getSupplierContactPerson() {
+        return supplierContactPerson;
+    }
+
+    public void setSupplierContactPerson(String supplierContactPerson) {
+        this.supplierContactPerson = supplierContactPerson;
+    }
+
+    public String getSupplierTel() {
+        return supplierTel;
+    }
+
+    public void setSupplierTel(String supplierTel) {
+        this.supplierTel = supplierTel;
+    }
+
+    public String getSupplierPhone() {
+        return supplierPhone;
+    }
+
+    public void setSupplierPhone(String supplierPhone) {
+        this.supplierPhone = supplierPhone;
+    }
+
+    public String getSupplierEmail() {
+        return supplierEmail;
+    }
+
+    public void setSupplierEmail(String supplierEmail) {
+        this.supplierEmail = supplierEmail;
+    }
+
+    public Date getSupplierCreateTime() {
+        return supplierCreateTime;
+    }
+
+    public void setSupplierCreateTime(Date supplierCreateTime) {
+        this.supplierCreateTime = supplierCreateTime;
+    }
+
+    public Date getSupplierUpdateTime() {
+        return supplierUpdateTime;
+    }
+
+    public void setSupplierUpdateTime(Date supplierUpdateTime) {
+        this.supplierUpdateTime = supplierUpdateTime;
+    }
+}

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminPtsBomController.java

@@ -0,0 +1,4 @@
+package com.iamberry.rst.controllers.pts;
+
+public class AdminPtsBomController {
+}

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

@@ -39,54 +39,56 @@
                 <button id="updatePrintId" type="button" class="my-btn-search" onclick="batchUpdatePring();" style="cursor:pointer; margin-right: 50px;margin-top: 10px;">修改为已打印</button>
 			</form>
 		</div>
-		<div class="mt-2" style="margin: 20px;">
-			<table class="table table-border table-bordered table-bg table-hover table-sort" style=" width: 50%;margin: 0 auto;">
-				<thead>
-				<tr class="text-c">
-                    <th width="1"><input name='checkbox' type='checkbox' value='' id="all" ></th>
-					<th width="10">产品条码</th>
-                    <th width="10">机器类型</th>
-					<th width="20">操作</th>
-				</tr>
-				</thead>
-				<tbody id="listid">
-                    <#if machineIsPrint == 1>
-                        <#assign machineList = machineList />
-                    <#else >
-                        <#assign machineList = page.dataList />
-                    </#if>
-					<#list machineList as list>
-						<tr class="text-c" id="${list.machineBarcode }">
-                            <td width="2">
-                                <input name='checkbox' type='checkbox' value='${list.machineBarcode }${list.machineQrcode }${list.machineProduceType }' machineId="${list.machineId }">
-                                <input type="hidden" value="${list.machineId + 1000000 }" id="${list.machineBarcode + 'Id'}">
-                            </td>
-							<td class="text-c" width="10">${list.machineBarcode }</td>
-                            <td class="text-c" width="10">
-                                <#if list.machineProduceType == 1>
-                                    净水机
-                                </#if>
-                                <#if list.machineProduceType == 2>
-                                    冲奶机
-                                </#if>
-                            </td>
-							<!-- 遍历操作 -->
-							<td class="td-manage text-c">
-                                <#if machineIsPrint == 1>
-                                <a onclick="updatePrint('${list.machineBarcode}');" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe6a7;</i></a>
-                                </#if>
-                                <a onclick="barCodePrint('${list.machineBarcode }'+'${list.machineQrcode }'+'${list.machineProduceType }','${list.machineId }');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>
-                            </td>
-						</tr>
-					</#list>
-				</tbody>
-			</table>
+		<div class="mt-2" style="margin: 20px; " >
+            <div style="width: 50%;margin: 0 auto; ">
+                <table class="table table-border table-bordered table-bg table-hover table-sort" >
+                    <thead>
+                    <tr class="text-c">
+                        <th width="1"><input name='checkbox' type='checkbox' value='' id="all" ></th>
+                        <th width="10">产品条码</th>
+                        <th width="10">机器类型</th>
+                        <th width="20">操作</th>
+                    </tr>
+                    </thead>
+                    <tbody id="listid">
+                        <#if machineIsPrint == 1>
+                            <#assign machineList = machineList />
+                        <#else >
+                            <#assign machineList = page.dataList />
+                        </#if>
+                        <#list machineList as list>
+                            <tr class="text-c" id="${list.machineBarcode }">
+                                <td width="2">
+                                    <input name='checkbox' type='checkbox' value='${list.machineBarcode }${list.machineQrcode }${list.machineProduceType }' machineId="${list.machineId }">
+                                    <input type="hidden" value="${list.machineId + 1000000 }" id="${list.machineBarcode + 'Id'}">
+                                </td>
+                                <td class="text-c" width="10">${list.machineBarcode }</td>
+                                <td class="text-c" width="10">
+                                    <#if list.machineProduceType == 1>
+                                        净水机
+                                    </#if>
+                                    <#if list.machineProduceType == 2>
+                                        冲奶机
+                                    </#if>
+                                </td>
+                                <!-- 遍历操作 -->
+                                <td class="td-manage text-c">
+                                    <#if machineIsPrint == 1>
+                                    <a onclick="updatePrint('${list.machineBarcode}');" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe6a7;</i></a>
+                                    </#if>
+                                    <a onclick="barCodePrint('${list.machineBarcode }'+'${list.machineQrcode }'+'${list.machineProduceType }','${list.machineId }');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>
+                                </td>
+                            </tr>
+                        </#list>
+                    </tbody>
+                </table>
 
-            <#if machineIsPrint == 2>
-                <tfoot>
-                    <div style="width: 60%;margin: 0 auto;"><#include "/base/page_util.ftl"></div>
-                </tfoot>
-            </#if>
+                <#if machineIsPrint == 2>
+                    <tfoot>
+                        <div style="margin-top: 20px"><#include "/base/page_util.ftl"></div>
+                    </tfoot>
+                </#if>
+            </div>
 
 			<input type="hidden" value="${machineId!''}" name="machineId" id="machineId">
             <input type="hidden" value="" name="codeId" id="codeId">