Commit 62d2665526db577d24a5d8b4125826bd60274f25
1 parent
41ad8ffe
页面显示 调整
Showing
5 changed files
with
150 additions
and
157 deletions
src/main/java/com/huaheng/common/constant/QuantityConstant.java
... | ... | @@ -463,6 +463,7 @@ public class QuantityConstant { |
463 | 463 | public static String U8_RECEIPT_TYPE_PI = "PI"; |
464 | 464 | public static String U8_RECEIPT_TYPE_SRI = "SRI"; |
465 | 465 | |
466 | + public static String SHIPMENT_TYPE_PO = "PO"; | |
466 | 467 | public static String U8_SHIPMENT_TYPE_OO = "OO"; |
467 | 468 | public static String U8_SHIPMENT_TYPE_MO = "MO"; |
468 | 469 | public static String U8_SHIPMENT_TYPE_SO = "SO"; |
... | ... |
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
... | ... | @@ -111,6 +111,7 @@ public class ReceiptHeaderController extends BaseController { |
111 | 111 | // .like(StringUtils.isNotEmpty(receiptHeader.getSupplierName()), ReceiptHeader::getCode, receiptHeader.getCode()) |
112 | 112 | .eq(StringUtils.isNotEmpty(receiptHeader.getCreatedBy()), ReceiptHeader::getCreatedBy, receiptHeader.getCreatedBy()) |
113 | 113 | .eq(StringUtils.isNotEmpty(receiptHeader.getReferCode()), ReceiptHeader::getReferCode, receiptHeader.getReferCode()) |
114 | + .eq( ReceiptHeader::getDeleted,false) | |
114 | 115 | .notIn(ReceiptHeader::getReceiptType,QuantityConstant.U8_RECEIPT_TYPE_PCI) |
115 | 116 | .le(StringUtils.isNotNull(receiptHeader.getFirstStatus()), |
116 | 117 | ReceiptHeader::getFirstStatus, receiptHeader.getFirstStatus()) |
... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
... | ... | @@ -103,6 +103,7 @@ public class ShipmentHeaderController extends BaseController { |
103 | 103 | .in(StringUtils.isEmpty(shipmentHeader.getCompanyCode()), ShipmentHeader::getCompanyCode, ShiroUtils.getCompanyCodeList()) |
104 | 104 | .eq(StringUtils.isNotEmpty(shipmentHeader.getCode()),ShipmentHeader::getCode,shipmentHeader.getCode()) |
105 | 105 | .eq(StringUtils.isNotEmpty(shipmentHeader.getShipmentType()),ShipmentHeader::getShipmentType,shipmentHeader.getShipmentType()) |
106 | + .notIn(ShipmentHeader::getShipmentType,"OO") | |
106 | 107 | .eq(StringUtils.isNotEmpty(shipmentHeader.getReferCode()), ShipmentHeader::getReferCode, shipmentHeader.getReferCode()) |
107 | 108 | .eq(StringUtils.isNotEmpty(shipmentHeader.getReferCodeType()), ShipmentHeader::getReferCodeType, shipmentHeader.getReferCodeType()) |
108 | 109 | .eq(shipmentHeader.getFirstStatus()!=null, ShipmentHeader::getFirstStatus, shipmentHeader.getFirstStatus()) |
... | ... |
src/main/resources/templates/shipment/shipmentDetail/add.html
... | ... | @@ -44,34 +44,34 @@ |
44 | 44 | 选择物料 |
45 | 45 | </a> |
46 | 46 | </div> |
47 | - <div class="form-group"> | |
48 | - <label class="col-sm-3 control-label">物料名称:</label> | |
49 | - <div class="col-sm-8"> | |
50 | - <input id="materialName" name="materialName" class="form-control" type="text" readonly="readonly"> | |
51 | - </div> | |
52 | - </div> | |
53 | - <div class="form-group"> | |
54 | - <label class="col-sm-3 control-label">物料规格:</label> | |
55 | - <div class="col-sm-8"> | |
56 | - <input id="materialSpec" name="materialSpec" class="form-control" type="text" readonly="readonly"> | |
57 | - </div> | |
58 | - </div> | |
59 | - <div class="form-group"> | |
60 | - <label class="col-sm-3 control-label">物料单位:</label> | |
61 | - <div class="col-sm-8"> | |
62 | - <input id="materialUnit" name="materialUnit" class="form-control" type="text" readonly="readonly"> | |
63 | - </div> | |
64 | - </div> | |
65 | - <div class="form-group"> | |
66 | - <label class="col-sm-3 control-label">库存状态:</label> | |
67 | - <div class="col-sm-8"> | |
68 | - <select id="inventorySts" name="inventorySts" class="form-control" | |
69 | - th:with="inventorySts=${@dict.getType('inventorySts')}"> | |
70 | - <option th:each="dict : ${inventorySts}" th:text="${dict['dictLabel']}" | |
71 | - th:value="${dict['dictValue']}"></option> | |
72 | - </select> | |
73 | - </div> | |
74 | - </div> | |
47 | +<!-- <div class="form-group">--> | |
48 | +<!-- <label class="col-sm-3 control-label">物料名称:</label>--> | |
49 | +<!-- <div class="col-sm-8">--> | |
50 | +<!-- <input id="materialName" name="materialName" class="form-control" type="text" readonly="readonly">--> | |
51 | +<!-- </div>--> | |
52 | +<!-- </div>--> | |
53 | +<!-- <div class="form-group">--> | |
54 | +<!-- <label class="col-sm-3 control-label">物料规格:</label>--> | |
55 | +<!-- <div class="col-sm-8">--> | |
56 | +<!-- <input id="materialSpec" name="materialSpec" class="form-control" type="text" readonly="readonly">--> | |
57 | +<!-- </div>--> | |
58 | +<!-- </div>--> | |
59 | +<!-- <div class="form-group">--> | |
60 | +<!-- <label class="col-sm-3 control-label">物料单位:</label>--> | |
61 | +<!-- <div class="col-sm-8">--> | |
62 | +<!-- <input id="materialUnit" name="materialUnit" class="form-control" type="text" readonly="readonly">--> | |
63 | +<!-- </div>--> | |
64 | +<!-- </div>--> | |
65 | +<!-- <div class="form-group">--> | |
66 | +<!-- <label class="col-sm-3 control-label">库存状态:</label>--> | |
67 | +<!-- <div class="col-sm-8">--> | |
68 | +<!-- <select id="inventorySts" name="inventorySts" class="form-control"--> | |
69 | +<!-- th:with="inventorySts=${@dict.getType('inventorySts')}">--> | |
70 | +<!-- <option th:each="dict : ${inventorySts}" th:text="${dict['dictLabel']}"--> | |
71 | +<!-- th:value="${dict['dictValue']}"></option>--> | |
72 | +<!-- </select>--> | |
73 | +<!-- </div>--> | |
74 | +<!-- </div>--> | |
75 | 75 | <div class="form-group"> |
76 | 76 | <label class="col-sm-3 control-label">发货数量:</label> |
77 | 77 | <div class="col-sm-8"> |
... | ... | @@ -79,89 +79,89 @@ |
79 | 79 | onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')"> |
80 | 80 | </div> |
81 | 81 | </div> |
82 | - <!-- <div class="form-group"> | |
82 | + <div class="form-group"> | |
83 | 83 | <label class="col-sm-3 control-label">工作令号:</label> |
84 | 84 | <div class="col-sm-8"> |
85 | 85 | <input id="moCode" name="moCode" class="form-control" type="text"> |
86 | 86 | </div> |
87 | - </div>--> | |
88 | - <div class="form-group"> | |
89 | - <label class="col-sm-3 control-label">出库口:</label> | |
90 | - <div class="col-sm-8"> | |
91 | - <select id="port" name="port" class="form-control"></select> | |
92 | - </div> | |
93 | - </div> | |
94 | - <div class="form-group"> | |
95 | - <label class="col-sm-3 control-label">批次:</label> | |
96 | - <div class="col-sm-8"> | |
97 | - <input id="batch" name="batch" class="form-control" type="text"> | |
98 | - </div> | |
99 | - </div> | |
100 | - <div class="form-group"> | |
101 | - <label class="col-sm-3 control-label">批号:</label> | |
102 | - <div class="col-sm-8"> | |
103 | - <input id="lot" name="lot" class="form-control" type="text"> | |
104 | - </div> | |
105 | - </div> | |
106 | - <div class="form-group"> | |
107 | - <label class="col-sm-3 control-label">项目号:</label> | |
108 | - <div class="col-sm-8"> | |
109 | - <input id="projectNo" name="project" class="form-control" type="text"> | |
110 | - </div> | |
111 | - </div> | |
112 | - <div class="form-group"> | |
113 | - <label class="col-sm-3 control-label">上游系统行号:</label> | |
114 | - <div class="col-sm-8"> | |
115 | - <input id="referLineNum" name="referLineNum" class="form-control" type="text" | |
116 | - onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')"> | |
117 | - </div> | |
118 | - </div> | |
119 | - <div class="form-group"> | |
120 | - <label class="col-sm-3 control-label">分配规则:</label> | |
121 | - <div class="col-sm-8"> | |
122 | - <select id="allocationRule" class="form-control" | |
123 | - th:with="allocationRule=${@FilterConfigDetailService.queryFilterConfigDetail('allocationRule')}"> | |
124 | - <option value=" " checked></option> | |
125 | - <option th:each="allocationRules:${allocationRule}" th:text="${allocationRules['description']}" | |
126 | - th:value="${allocationRules['code']}"></option> | |
127 | - </select> | |
128 | - </div> | |
129 | - </div> | |
130 | - <!--<div class="form-group">--> | |
131 | - <!--<label class="col-sm-3 control-label">分配规则:</label>--> | |
132 | - <!--<div class="col-sm-8">--> | |
133 | - <!--<input id="allocationRule" name="allocationRule" class="form-control" type="text">--> | |
134 | - <!--</div>--> | |
135 | - <!--</div>--> | |
136 | - <div class="form-group"> | |
137 | - <label class="col-sm-3 control-label">补货规则:</label> | |
138 | - <div class="col-sm-8"> | |
139 | - <input id="replenishmentRule" name="replenishmentRule" class="form-control" type="text"> | |
140 | - </div> | |
141 | - </div> | |
142 | - <div class="form-group"> | |
143 | - <label class="col-sm-3 control-label">拣货规则:</label> | |
144 | - <div class="col-sm-8"> | |
145 | - <select id="pickingRule" class="form-control" | |
146 | - th:with="pickingRule=${@FilterConfigDetailService.queryFilterConfigDetail('shipmentPickingRule')}"> | |
147 | - <option value=" " checked></option> | |
148 | - <option th:each="pickingRules:${pickingRule}" th:text="${pickingRules['description']}" | |
149 | - th:value="${pickingRules['code']}"></option> | |
150 | - </select> | |
151 | - </div> | |
152 | - </div> | |
153 | - <div class="form-group"> | |
154 | - <label class="col-sm-3 control-label">生产日期:</label> | |
155 | - <div class="col-sm-8"> | |
156 | - <input id="manufactureDate" name="manufactureDate" class="form-control" type="text"> | |
157 | - </div> | |
158 | - </div> | |
159 | - <div class="form-group"> | |
160 | - <label class="col-sm-3 control-label">失效日期:</label> | |
161 | - <div class="col-sm-8"> | |
162 | - <input id="expirationDate" name="expirationDate" class="form-control" type="text"> | |
163 | - </div> | |
164 | 87 | </div> |
88 | +<!-- <div class="form-group">--> | |
89 | +<!-- <label class="col-sm-3 control-label">出库口:</label>--> | |
90 | +<!-- <div class="col-sm-8">--> | |
91 | +<!-- <select id="port" name="port" class="form-control"></select>--> | |
92 | +<!-- </div>--> | |
93 | +<!-- </div>--> | |
94 | +<!-- <div class="form-group">--> | |
95 | +<!-- <label class="col-sm-3 control-label">批次:</label>--> | |
96 | +<!-- <div class="col-sm-8">--> | |
97 | +<!-- <input id="batch" name="batch" class="form-control" type="text">--> | |
98 | +<!-- </div>--> | |
99 | +<!-- </div>--> | |
100 | +<!-- <div class="form-group">--> | |
101 | +<!-- <label class="col-sm-3 control-label">批号:</label>--> | |
102 | +<!-- <div class="col-sm-8">--> | |
103 | +<!-- <input id="lot" name="lot" class="form-control" type="text">--> | |
104 | +<!-- </div>--> | |
105 | +<!-- </div>--> | |
106 | +<!-- <div class="form-group">--> | |
107 | +<!-- <label class="col-sm-3 control-label">项目号:</label>--> | |
108 | +<!-- <div class="col-sm-8">--> | |
109 | +<!-- <input id="projectNo" name="project" class="form-control" type="text">--> | |
110 | +<!-- </div>--> | |
111 | +<!-- </div>--> | |
112 | +<!-- <div class="form-group">--> | |
113 | +<!-- <label class="col-sm-3 control-label">上游系统行号:</label>--> | |
114 | +<!-- <div class="col-sm-8">--> | |
115 | +<!-- <input id="referLineNum" name="referLineNum" class="form-control" type="text"--> | |
116 | +<!-- onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')">--> | |
117 | +<!-- </div>--> | |
118 | +<!-- </div>--> | |
119 | +<!-- <div class="form-group">--> | |
120 | +<!-- <label class="col-sm-3 control-label">分配规则:</label>--> | |
121 | +<!-- <div class="col-sm-8">--> | |
122 | +<!-- <select id="allocationRule" class="form-control"--> | |
123 | +<!-- th:with="allocationRule=${@FilterConfigDetailService.queryFilterConfigDetail('allocationRule')}">--> | |
124 | +<!-- <option value=" " checked></option>--> | |
125 | +<!-- <option th:each="allocationRules:${allocationRule}" th:text="${allocationRules['description']}"--> | |
126 | +<!-- th:value="${allocationRules['code']}"></option>--> | |
127 | +<!-- </select>--> | |
128 | +<!-- </div>--> | |
129 | +<!-- </div>--> | |
130 | +<!-- <!–<div class="form-group">–>--> | |
131 | +<!-- <!–<label class="col-sm-3 control-label">分配规则:</label>–>--> | |
132 | +<!-- <!–<div class="col-sm-8">–>--> | |
133 | +<!-- <!–<input id="allocationRule" name="allocationRule" class="form-control" type="text">–>--> | |
134 | +<!-- <!–</div>–>--> | |
135 | +<!-- <!–</div>–>--> | |
136 | +<!-- <div class="form-group">--> | |
137 | +<!-- <label class="col-sm-3 control-label">补货规则:</label>--> | |
138 | +<!-- <div class="col-sm-8">--> | |
139 | +<!-- <input id="replenishmentRule" name="replenishmentRule" class="form-control" type="text">--> | |
140 | +<!-- </div>--> | |
141 | +<!-- </div>--> | |
142 | +<!-- <div class="form-group">--> | |
143 | +<!-- <label class="col-sm-3 control-label">拣货规则:</label>--> | |
144 | +<!-- <div class="col-sm-8">--> | |
145 | +<!-- <select id="pickingRule" class="form-control"--> | |
146 | +<!-- th:with="pickingRule=${@FilterConfigDetailService.queryFilterConfigDetail('shipmentPickingRule')}">--> | |
147 | +<!-- <option value=" " checked></option>--> | |
148 | +<!-- <option th:each="pickingRules:${pickingRule}" th:text="${pickingRules['description']}"--> | |
149 | +<!-- th:value="${pickingRules['code']}"></option>--> | |
150 | +<!-- </select>--> | |
151 | +<!-- </div>--> | |
152 | +<!-- </div>--> | |
153 | +<!-- <div class="form-group">--> | |
154 | +<!-- <label class="col-sm-3 control-label">生产日期:</label>--> | |
155 | +<!-- <div class="col-sm-8">--> | |
156 | +<!-- <input id="manufactureDate" name="manufactureDate" class="form-control" type="text">--> | |
157 | +<!-- </div>--> | |
158 | +<!-- </div>--> | |
159 | +<!-- <div class="form-group">--> | |
160 | +<!-- <label class="col-sm-3 control-label">失效日期:</label>--> | |
161 | +<!-- <div class="col-sm-8">--> | |
162 | +<!-- <input id="expirationDate" name="expirationDate" class="form-control" type="text">--> | |
163 | +<!-- </div>--> | |
164 | +<!-- </div>--> | |
165 | 165 | <div class="form-group"> |
166 | 166 | <div class="form-control-static col-sm-offset-9"> |
167 | 167 | <button type="submit" class="btn btn-primary">提交</button> |
... | ... |
src/main/resources/templates/shipment/shipmentHeader/add.html
... | ... | @@ -11,7 +11,7 @@ |
11 | 11 | <div class="form-group"> |
12 | 12 | <label class="col-sm-3 control-label">出库单类型:</label> |
13 | 13 | <div class="col-sm-8"> |
14 | - <select id="shipmentType" class="form-control" th:with="shipmentType=${@ShipmentTypeService.getType()}"> | |
14 | + <select id="shipmentType" name="shipmentType" class="form-control" th:with="shipmentType=${@ShipmentTypeService.getType()}"> | |
15 | 15 | <option th:each="dict : ${shipmentType}" th:text="${dict['name']}" th:value="${dict['code']}"></option> |
16 | 16 | </select> |
17 | 17 | </div> |
... | ... | @@ -33,51 +33,51 @@ |
33 | 33 | </select> |
34 | 34 | </div> |
35 | 35 | </div> |
36 | - <div class="form-group"> | |
37 | - <label class="col-sm-3 control-label">上游订单号:</label> | |
38 | - <div class="col-sm-8"> | |
39 | - <input id="referCode" name="referCode" class="form-control" type="text"> | |
40 | - </div> | |
41 | - </div> | |
42 | - <div class="form-group"> | |
43 | - <label class="col-sm-3 control-label">上游平台:</label> | |
44 | - <div class="col-sm-8"> | |
45 | - <input id="referPlatform" name="referPlatform" class="form-control" type="text"> | |
46 | - </div> | |
47 | - </div> | |
48 | - <div class="form-group"> | |
49 | - <label class="col-sm-3 control-label">客户编码:</label> | |
50 | - <div class="col-sm-8"> | |
51 | - <select id="customerCode" name="customerCode" class="form-control"></select> | |
52 | - </div> | |
53 | - </div> | |
54 | - <div class="form-group"> | |
55 | - <label class="col-sm-3 control-label">发货站台:</label> | |
56 | - <div class="col-sm-8"> | |
57 | - <!--<input id="station" name="station" class="form-control" type="text">--> | |
58 | - <select id="station" name="station" class="form-control" th:with="station=${@dict.getType('station')}"> | |
59 | - <option th:each="dict : ${station}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> | |
60 | - </select> | |
61 | - </div> | |
62 | - </div> | |
63 | - <div class="form-group"> | |
64 | - <label class="col-sm-3 control-label">优先级(0-99):</label> | |
65 | - <div class="col-sm-8"> | |
66 | - <input id="priority" name="priority" class="form-control" type="text"> | |
67 | - </div> | |
68 | - </div> | |
36 | +<!-- <div class="form-group"> --> | |
37 | +<!-- <label class="col-sm-3 control-label">上游订单号:</label>--> | |
38 | +<!-- <div class="col-sm-8">--> | |
39 | +<!-- <input id="referCode" name="referCode" class="form-control" type="text">--> | |
40 | +<!-- </div>--> | |
41 | +<!-- </div>--> | |
42 | +<!-- <div class="form-group"> --> | |
43 | +<!-- <label class="col-sm-3 control-label">上游平台:</label>--> | |
44 | +<!-- <div class="col-sm-8">--> | |
45 | +<!-- <input id="referPlatform" name="referPlatform" class="form-control" type="text">--> | |
46 | +<!-- </div>--> | |
47 | +<!-- </div>--> | |
48 | +<!-- <div class="form-group">--> | |
49 | +<!-- <label class="col-sm-3 control-label">客户编码:</label>--> | |
50 | +<!-- <div class="col-sm-8">--> | |
51 | +<!-- <select id="customerCode" name="customerCode" class="form-control"></select>--> | |
52 | +<!-- </div>--> | |
53 | +<!-- </div>--> | |
54 | +<!-- <div class="form-group">--> | |
55 | +<!-- <label class="col-sm-3 control-label">发货站台:</label>--> | |
56 | +<!-- <div class="col-sm-8">--> | |
57 | +<!-- <!–<input id="station" name="station" class="form-control" type="text">–>--> | |
58 | +<!-- <select id="station" name="station" class="form-control" th:with="station=${@dict.getType('station')}">--> | |
59 | +<!-- <option th:each="dict : ${station}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>--> | |
60 | +<!-- </select>--> | |
61 | +<!-- </div>--> | |
62 | +<!-- </div>--> | |
63 | +<!-- <div class="form-group"> --> | |
64 | +<!-- <label class="col-sm-3 control-label">优先级(0-99):</label>--> | |
65 | +<!-- <div class="col-sm-8">--> | |
66 | +<!-- <input id="priority" name="priority" class="form-control" type="text">--> | |
67 | +<!-- </div>--> | |
68 | +<!-- </div>--> | |
69 | 69 | <div class="form-group"> |
70 | 70 | <label class="col-sm-3 control-label">备注:</label> |
71 | 71 | <div class="col-sm-8"> |
72 | 72 | <input id="remark" name="remark" class="form-control" type="text"> |
73 | 73 | </div> |
74 | 74 | </div> |
75 | - <div class="form-group"> | |
76 | - <label class="col-sm-3 control-label">要求到货时间:</label> | |
77 | - <div class="col-sm-8"> | |
78 | - <input id="requestedDeliveryDate" name="requestedDeliveryDate" class="form-control" type="text"> | |
79 | - </div> | |
80 | - </div> | |
75 | +<!-- <div class="form-group">--> | |
76 | +<!-- <label class="col-sm-3 control-label">要求到货时间:</label>--> | |
77 | +<!-- <div class="col-sm-8">--> | |
78 | +<!-- <input id="requestedDeliveryDate" name="requestedDeliveryDate" class="form-control" type="text">--> | |
79 | +<!-- </div>--> | |
80 | +<!-- </div>--> | |
81 | 81 | <!--<div class="form-group">--> |
82 | 82 | <!--<label class="col-sm-3 control-label">是否有效:</label>--> |
83 | 83 | <!--<div class="col-sm-8">--> |
... | ... | @@ -139,17 +139,7 @@ |
139 | 139 | cache: true, |
140 | 140 | type: "POST", |
141 | 141 | url: prefix + "/add", |
142 | - data: { | |
143 | - "shipmentType": $("#shipmentType option:selected").val(), | |
144 | - "companyCode": $("#companyCode option:selected").attr("code"), | |
145 | - "referCode": $("input[name='referCode']").val(), | |
146 | - "referPlatform": $("input[name='referPlatform']").val(), | |
147 | - "customerCode": $("#customerCode option:selected").val(), | |
148 | - "priority": $("input[name='priority']").val(), | |
149 | - "requestedDeliveryDate": $("input[name='requestedDeliveryDate']").val(), | |
150 | - "remark": $("input[name='remark']").val(), | |
151 | - "uWarehouseCode": $("#uWarehouseCode option:selected").val(), | |
152 | - }, | |
142 | + data: $("#form-shipmentHeader-add").serializeArray(), | |
153 | 143 | async: false, |
154 | 144 | error: function (request) { |
155 | 145 | $.modal.alertError("请求失败!"); |
... | ... |