发运管理-确认到货时无法匹配合同

adm/src/main/java/cacheParam.properties

@@ -16,6 +16,6 @@ redis_TimeOut=1000
 
 redis_TestOnBorrow=true
 
-redis_Auth=123456
+redis_Auth=guomao@2022
 
 redis_TimeToLive=172800

adm/src/main/java/com/minpay/guomao/warehousemanage/action/WarehouseInventoryAction.java

@@ -252,7 +252,7 @@ public class WarehouseInventoryAction implements IMINAction{
 				weight2 = CommonUtil.add(CommonUtil.objToString(resList.get(i).get("reaWeight"))  ,weight2);
 				stockIdList.add(CommonUtil.objToString(resList.get(i).get("id")));
 				
-				if ("01".equals(channel) || "02".equals(channel)) {
+				if ("01".equals(channel) || "02,03".equals(channel)) {
 					ApGiveOutExample ex  = new ApGiveOutExample();
 					ex.createCriteria().andStockIdEqualTo(resList.get(i).get("id")).andStateEqualTo("00").andBranchIdEqualTo(user.getBranchId());
 					//查询是否有待确认入库的发出量

adm/src/main/webapp/WEB-INF/config.properties

@@ -3,16 +3,16 @@
 #dataSource.driverClassName=com.mysql.jdbc.Driver
 
 #ceshi
-dataSource.url=jdbc:mysql://106.12.253.71:3306/guomaotest?useUnicode=true&characterEncoding=UTF8&autoReconnect=true
-dataSource.username=root
-dataSource.password=Keao@2022
+#dataSource.url=jdbc:mysql://106.12.253.71:3306/guomaotest?useUnicode=true&characterEncoding=UTF8&autoReconnect=true
+#dataSource.username=root
+#dataSource.password=Keao@2022
 #shengchan
 #dataSource.url=jdbc:mysql://rm-bp1fic3mnw98q3149to.mysql.rds.aliyuncs.com:3306/guomaodb?useUnicode=true&characterEncoding=UTF8
 #dataSource.username=guomaouser
 #dataSource.password=Aa111111
-#dataSource.url=jdbc:mysql://172.16.128.210:3306/guomaodb?useUnicode=true&characterEncoding=UTF8
-#dataSource.username=root
-#dataSource.password=123456
+dataSource.url=jdbc:mysql://172.16.128.210:3306/guomaodb?useUnicode=true&characterEncoding=UTF8
+dataSource.username=root
+dataSource.password=guomao@2022
 
 
 config.MINDebug=false

adm/src/main/webapp/admin/giveOutManage/confirmDh.html

@@ -119,7 +119,7 @@
 			var dhDate = $("#dhDate").val();
 			var wareId = $("#warehouseId").val();
 			var xsContractId = $("#contractId").val();//销售合同Id
-			var dhType = $("select[name='dhType']").val();//01到货入库02直发到厂
+			var dhType = $("select[name='dhType']").val();//01到货入库02直发到厂03工厂自提
 			if(dhType == '01'){
 				if (isEmpty(wareId)) {
 					$.ErrorAlert("请选择仓库!");
@@ -159,7 +159,7 @@
 						}
 	      			});
 	      		});
-			}else if(dhType == '02'){
+			}else if(dhType == '02' || dhType == '03'){
 				if (isEmpty(xsContractId)) {
 					$.ErrorAlert("请选择合同!");
 					return;
@@ -262,13 +262,20 @@
 		form = layui.form;
 		var layer = layui.layer;
 		initSelect('dhType',"DH_TYPE","dhType","01",true);
+		var options = $("select[name='dhType']").children();
+		for(let i = 0; i < options.length; i ++) {
+			if($(options[i]).attr("value") == '00') {
+				$(options[i]).remove();
+				break;
+			}
+		}
         form.render();
     	form.on('select(dhType)', function(data){
     		if(data.value == '01'){//到货入库
     			$('#chooseContract').hide();
     			$('#chooseWare').show();
     			
-    		}else if (data.value == '02') {//直发到厂
+    		}else if (data.value == '02' || data.value == '03') {//直发到厂
     			$('#chooseWare').hide();
     			$('#chooseContract').show();
     		}

adm/src/main/webapp/admin/giveOutManage/confirmEnter.html

@@ -340,7 +340,7 @@
 	   					}); 
 	 				}
 	 			});
-			}else if(channel == '02'){//直发到厂
+			}else if(channel == '02,03'){//直发到厂
 				$.request({
 	 				action : 'GiveStockManageAction/giveoutConfirmWarehousingZhf',
 	 				data : {

adm/src/main/webapp/layui/css/layui.css

@@ -657,7 +657,7 @@ a cite{font-style: normal; *cursor:pointer;}
 .layui-form-label-col{display: block; float: none; padding: 9px 0; line-height: 20px; text-align: left;}
 .layui-form-item .layui-inline{margin-bottom: 5px; margin-right: 10px;}
 .layui-input-block, .layui-input-inline{position: relative;}
-.layui-input-block{margin-left: 110px; min-height: 36px;}
+.layui-input-block{margin-left: 140px; min-height: 36px;}
 .layui-input-inline{display: inline-block; vertical-align: middle;}
 .layui-form-item .layui-input-inline{float: left; width: 190px; margin-right: 10px;}
 .layui-form-text .layui-input-inline{width: auto;}