称重修改

src/main/resources/config/application.yml

@@ -55,12 +55,12 @@ jdbc:
   type: mysql
   driver: com.mysql.cj.jdbc.Driver
 #  url: jdbc:mysql://127.0.0.1:3307/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#  url: jdbc:mysql://192.168.21.99:3306/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_x13?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#  username: mescloud
-#  password: 8neywEN86NLam3ts
-  username: root
-  password: 123456
+  url: jdbc:mysql://192.168.21.99:3306/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_x13?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+  username: mescloud
+  password: 8neywEN86NLam3ts
+#  username: root
+#  password: 123456
 #
   testSql: SELECT 1
 
@@ -674,6 +674,7 @@ shiro:
     ${adminPath}/mes/mesProductRecord/submit = anon
     ${adminPath}/mes/mesRepairItems/submit = anon
     ${adminPath}/mes/mesProductQm/addItem = anon
+    ${adminPath}/mes/mesProductRecord/dp350 = anon
     ${adminPath}/** = user
 
 

src/main/resources/views/modules/mes/mesProductList.html

@@ -23,12 +23,12 @@
 						<#form:input path="sn" maxlength="100" class="form-control width-260"/>
 					</div>
 				</div>
-<!--				<div class="form-group">-->
-<!--					<label class="control-label">${text('生产批号')}：</label>-->
-<!--					<div class="control-inline">-->
-<!--						<#form:input path="psn" maxlength="200" class="form-control width-120"/>-->
-<!--					</div>-->
-<!--				</div>-->
+			<!--	<div class="form-group">
+					<label class="control-label">${text('生产批号')}：</label>
+					<div class="control-inline">
+						<#form:input path="psn" maxlength="200" class="form-control width-120"/>
+					</div>
+				</div>-->
 <!--				<div class="form-group">-->
 <!--					<label class="control-label">${text('产品名称')}：</label>-->
 <!--					<div class="control-inline">-->
@@ -47,18 +47,18 @@
 						<#form:input path="cate" maxlength="255" class="form-control width-120"/>
 					</div>
 				</div>
-<!--				<div class="form-group">-->
-<!--					<label class="control-label">${text('打包批号')}：</label>-->
-<!--					<div class="control-inline">-->
-<!--						<#form:input path="batchSn" maxlength="100" class="form-control width-120"/>-->
-<!--					</div>-->
-<!--				</div>-->
-<!--				<div class="form-group">-->
-<!--					<label class="control-label">${text('重量')}：</label>-->
-<!--					<div class="control-inline">-->
-<!--						<#form:input path="weight" maxlength="10" class="form-control width-120"/>-->
-<!--					</div>-->
-<!--				</div>-->
+				<div class="form-group">
+					<label class="control-label">${text('打包批号')}：</label>
+					<div class="control-inline">
+						<#form:input path="batchSn" maxlength="100" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('重量')}：</label>
+					<div class="control-inline">
+						<#form:input path="weight" maxlength="10" class="form-control width-120"/>
+					</div>
+				</div>
 			<div class="form-group">
 				<label class="control-label">${text('创建日期')}：</label>
 				<div class="control-inline">
@@ -108,14 +108,14 @@ $('#dataGrid').dataGrid({
 				return js.getDictLabel(${@DictUtils.getDictListJson('mes_product_status')}, val, '${text("未知")}', true);
 			}},
 		// {header:'${text("备注")}', name:'remark', index:'a.remark', width:150, align:"center"},
-		//  {header:'${text("打包批号")}', name:'batchSn', index:'a.batch_sn', width:150, align:"center"},
-		// {header:'${text("重量（kg）")}', name:'weight', index:'a.weight', width:150, align:"center", formatter: function(val, obj, row, act){
-		// 		if(val){
-		// 			return parseFloat(val);
-		// 		}else{
-		// 			return "";
-		// 		}
-		// 	}},
+		  {header:'${text("打包批号")}', name:'batchSn', index:'a.batch_sn', width:150, align:"center"},
+		  {header:'${text("重量（kg）")}', name:'weight', index:'a.weight', width:150, align:"center", formatter: function(val, obj, row, act){
+		  		if(val){
+		  			return parseFloat(val);
+		  		}else{
+		  			return "";
+		  		}
+		  	}},
 		// {header:'${text("重量（kg）")}', name:'weight', index:'a.weight', width:150, align:"center"},
 		// {header:'${text("包装时间")}', name:'bindDate', index:'a.bind_date', width:150, align:"center"},
 		// {header:'${text("包装人")}', name:'bindBy', index:'a.bind_by', width:150, align:"center"},