wms / wms_xianyangming · Commits

Commit f0fe7d1d3fd0cdb84422ccda3dea996110d2c869

Authored by pengyongcheng
1 parent d3f95d6b

fix: 任务、组盘、配盘头表页面新增单据编码查询

Inline Side-by-side
Showing 16 changed files with 15 additions and 74 deletions
src/main/java/com/huaheng/api/mes/controller/MesController.java
  View file @f0fe7d1
... ... @@ -211,12 +211,6 @@ public class MesController extends BaseController {
211 211 if (StringUtils.isEmpty(mesOrder.getProductCode())) {
212 212 return AjaxResult.error("productCode 为空");
213 213 }
214   - if (StringUtils.isNull(mesOrder.getShipmentReferStatus())) {
215   - return AjaxResult.error("shipmentReferStatus 为空");
216   - }
217   - if (StringUtils.isEmpty(mesOrder.getShipmentReferCode())) {
218   - return AjaxResult.error("shipmentReferCode 为空");
219   - }
220 214 if (orderQty == null) {
221 215 return AjaxResult.error("orderQty 为空");
222 216 }
... ... @@ -485,9 +479,6 @@ public class MesController extends BaseController {
485 479 if (StringUtils.isEmpty(mesShipment.getOrderCode())) {
486 480 return AjaxResult.error("orderCode 为空");
487 481 }
488   - /*if (StringUtils.isEmpty(mesShipment.getShipmentReferCode())) {
489   - return AjaxResult.error("shipmentReferCode 为空");
490   - }*/
491 482 if (StringUtils.isEmpty(mesShipment.getToPort())) {
492 483 return AjaxResult.error("toPort 为空");
493 484 }
... ...
src/main/java/com/huaheng/api/mes/domain/MesOrder.java
  View file @f0fe7d1
... ... @@ -22,10 +22,7 @@ public class MesOrder {
22 22 * 日工单
23 23 */
24 24 private String chidOrderCode;
25   - /**
26   - * 领料单号
27   - */
28   - private String shipmentReferCode;
  25 +
29 26 /**
30 27 * 工单状态
31 28 */
... ...
src/main/java/com/huaheng/api/mes/domain/MesReturn.java
  View file @f0fe7d1
... ... @@ -23,11 +23,6 @@ public class MesReturn {
23 23 private String orderCode;
24 24  
25 25 /**
26   - * 领料单号
27   - */
28   - private String shipmentReferCode;
29   -
30   - /**
31 26 * 载具类型编码
32 27 */
33 28 private String containerTypeCode;
... ...
src/main/java/com/huaheng/api/mes/domain/MesShipment.java
  View file @f0fe7d1
... ... @@ -19,11 +19,6 @@ public class MesShipment {
19 19 private String orderCode;
20 20  
21 21 /**
22   - * 领料单号
23   - */
24   - //private String shipmentReferCode;
25   -
26   - /**
27 22 * 目标工位站点
28 23 */
29 24 private String toPort;
... ...
src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
  View file @f0fe7d1
... ... @@ -158,8 +158,6 @@ public class MesServiceImpl implements MesService {
158 158 receiptHeader.setReferCode(taskNo);
159 159 receiptHeader.setOrderCode(mesOrder.getOrderCode());
160 160 receiptHeader.setOrderStatus(mesOrder.getOrderStatus());
161   - receiptHeader.setChidOrderCode(mesOrder.getChidOrderCode());
162   - receiptHeader.setShipmentReferCode(mesOrder.getShipmentReferCode());
163 161 receiptHeader.setTotalLines(mesOrderMaterialList.size());
164 162 receiptHeader.setTotalQty(mesOrderMaterialList.stream()
165 163 .map(MesOrderMaterial::getShipmentReferQty)
... ...
src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java
  View file @f0fe7d1
... ... @@ -86,7 +86,6 @@ public class InventoryTransactionController extends BaseController {
86 86 .like(StringUtils.isNotEmpty(inventoryTransaction.getOrderCode()), InventoryTransaction::getOrderCode, inventoryTransaction.getOrderCode())
87 87 .like(StringUtils.isNotEmpty(inventoryTransaction.getOrderNumber()), InventoryTransaction::getOrderNumber, inventoryTransaction.getOrderNumber())
88 88 .like(StringUtils.isNotEmpty(inventoryTransaction.getBatchNumber()), InventoryTransaction::getBatchNumber, inventoryTransaction.getBatchNumber())
89   -// .like(StringUtils.isNotEmpty(inventoryTransaction.getShipmentReferCode()), InventoryTransaction::getShipmentReferCode, inventoryTransaction.getShipmentReferCode())
90 89 .like(StringUtils.isNotEmpty(inventoryTransaction.getReferCode()), InventoryTransaction::getReferCode, inventoryTransaction.getReferCode())
91 90 //货主
92 91 .in(InventoryTransaction::getCompanyCode, ShiroUtils.getCompanyCodeList())
... ...
src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java
  View file @f0fe7d1
... ... @@ -304,13 +304,6 @@ public class InventoryTransaction implements Serializable {
304 304 private String batchNumber;
305 305  
306 306 /**
307   - * 领料单号
308   - */
309   - /*@TableField(value = "shipmentReferCode")
310   - @ApiModelProperty(value = "领料单号")
311   - private String shipmentReferCode;*/
312   -
313   - /**
314 307 * 单据明细编码
315 308 */
316 309 @TableField(value = "billDetailId")
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
  View file @f0fe7d1
... ... @@ -101,6 +101,7 @@ public class ReceiptContainerHeaderController extends BaseController {
101 101 lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), ReceiptContainerHeader::getCreated, createdBegin)
102 102 .le(StringUtils.isNotEmpty(createdEnd), ReceiptContainerHeader::getCreated, createdEnd)
103 103 .eq(ReceiptContainerHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
  104 + .like(StringUtils.isNotEmpty(receiptContainerHeader.getReceiptCode()), ReceiptContainerHeader::getReceiptCode, receiptContainerHeader.getReceiptCode())
104 105 .eq(StringUtils.isNotEmpty(receiptContainerHeader.getContainerCode()), ReceiptContainerHeader::getContainerCode, receiptContainerHeader.getContainerCode())
105 106 .eq(StringUtils.isNotEmpty(receiptContainerHeader.getVehicleCode()), ReceiptContainerHeader::getVehicleCode, receiptContainerHeader.getVehicleCode())
106 107 .eq(StringUtils.isNotEmpty(receiptContainerHeader.getToLocation()), ReceiptContainerHeader::getToLocation, receiptContainerHeader.getToLocation())
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/domain/ReceiptContainerHeader.java
  View file @f0fe7d1
... ... @@ -258,13 +258,6 @@ public class ReceiptContainerHeader implements Serializable {
258 258 private String batchNumber;
259 259  
260 260 /**
261   - * 领料单号
262   - */
263   - @TableField(value = "shipmentReferCode")
264   - @ApiModelProperty(value="领料单号")
265   - private String shipmentReferCode;
266   -
267   - /**
268 261 * 载具类型编码
269 262 */
270 263 @TableField(value = "vehicleTypeCode")
... ... @@ -285,12 +278,5 @@ public class ReceiptContainerHeader implements Serializable {
285 278 @ApiModelProperty(value="入库单编码")
286 279 private String receiptCode;
287 280  
288   - /**
289   - * 出库单编码
290   - */
291   - @TableField(value = "shipmentCode")
292   - @ApiModelProperty(value = "出库单编码")
293   - private String shipmentCode;
294   -
295 281 private static final long serialVersionUID = 1L;
296 282 }
297 283 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java
  View file @f0fe7d1
... ... @@ -315,13 +315,6 @@ public class ReceiptHeader implements Serializable {
315 315 private String receiptReferCode;
316 316  
317 317 /**
318   - * 日工单
319   - */
320   - @TableField(value = "chidOrderCode")
321   - @ApiModelProperty(value="日工单")
322   - private String chidOrderCode;
323   -
324   - /**
325 318 * 主工单
326 319 */
327 320 @TableField(value = "orderCode")
... ...
src/main/java/com/huaheng/pc/shipment/shipmentContainerDetail/domain/ShipmentContainerDetail.java
  View file @f0fe7d1
... ... @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.baomidou.mybatisplus.annotation.TableName;
7 7 import io.swagger.annotations.ApiModelProperty;
8 8 import lombok.Data;
9   -import lombok.Getter;
10 9  
11 10 import java.io.Serializable;
12 11 import java.math.BigDecimal;
... ... @@ -418,14 +417,6 @@ public class ShipmentContainerDetail implements Serializable {
418 417 private String orderCode;
419 418  
420 419 /**
421   - * 领料单单号
422   - */
423   - @Getter
424   - @TableField(value = "shipmentReferCode")
425   - @ApiModelProperty(value = "领料单单号")
426   - private String shipmentReferCode;
427   -
428   - /**
429 420 * 高度
430 421 */
431 422 @TableField(value = "high")
... ...
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java
  View file @f0fe7d1
... ... @@ -69,7 +69,9 @@ public class ShipmentContainerHeaderController extends BaseController {
69 69 .ge(StringUtils.isNotEmpty(createdBegin), ShipmentContainerHeader::getCreated, createdBegin)
70 70 .le(StringUtils.isNotEmpty(createdEnd), ShipmentContainerHeader::getCreated, createdEnd)
71 71 .in(ShipmentContainerHeader::getCompanyCode, ShiroUtils.getCompanyCodeList())
  72 + .like(StringUtils.isNotEmpty(shipmentContainerHeader.getShipmentCode()), ShipmentContainerHeader::getShipmentCode, shipmentContainerHeader.getShipmentCode())
72 73 .eq(StringUtils.isNotEmpty(shipmentContainerHeader.getContainerCode()), ShipmentContainerHeader::getContainerCode, shipmentContainerHeader.getContainerCode())
  74 + .eq(StringUtils.isNotEmpty(shipmentContainerHeader.getVehicleCode()), ShipmentContainerHeader::getVehicleCode, shipmentContainerHeader.getVehicleCode())
73 75 .eq(StringUtils.isNotEmpty(shipmentContainerHeader.getLocationCode()), ShipmentContainerHeader::getLocationCode, shipmentContainerHeader.getLocationCode())
74 76 .eq(StringUtils.isNotEmpty(shipmentContainerHeader.getCreatedBy()), ShipmentContainerHeader::getCreatedBy, shipmentContainerHeader.getCreatedBy())
75 77 .eq(shipmentContainerHeader.getStatus() != null, ShipmentContainerHeader::getStatus, shipmentContainerHeader.getStatus())
... ...
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
  View file @f0fe7d1
... ... @@ -18,7 +18,6 @@ import com.huaheng.framework.web.domain.AjaxResult;
18 18 import com.huaheng.framework.web.page.PageDomain;
19 19 import com.huaheng.framework.web.page.TableDataInfo;
20 20 import com.huaheng.framework.web.page.TableSupport;
21   -import com.huaheng.framework.web.service.ConfigService;
22 21 import com.huaheng.pc.config.container.domain.Container;
23 22 import com.huaheng.pc.config.container.service.ContainerService;
24 23 import com.huaheng.pc.config.containerType.domain.ContainerType;
... ... @@ -56,8 +55,6 @@ public class TaskHeaderController extends BaseController {
56 55 @Resource
57 56 private TaskCancelService taskCancelService;
58 57 @Resource
59   - private ConfigService configService;
60   - @Resource
61 58 private ContainerService containerService;
62 59 @Resource
63 60 private ContainerTypeService containerTypeService;
... ... @@ -89,6 +86,8 @@ public class TaskHeaderController extends BaseController {
89 86 lambdaQueryWrapper.eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
90 87 .eq(StringUtils.isNotNull(internalTaskType), TaskHeader::getInternalTaskType, internalTaskType)
91 88 .eq(StringUtils.isNotNull(taskHeader.getId()), TaskHeader::getId, taskHeader.getId())
  89 + .like(StringUtils.isNotEmpty(taskHeader.getReceiptCode()), TaskHeader::getReceiptCode, taskHeader.getReceiptCode())
  90 + .like(StringUtils.isNotEmpty(taskHeader.getShipmentCode()), TaskHeader::getShipmentCode, taskHeader.getShipmentCode())
92 91 .like(StringUtils.isNotEmpty(taskHeader.getContainerCode()), TaskHeader::getContainerCode, taskHeader.getContainerCode())
93 92 .like(StringUtils.isNotEmpty(taskHeader.getVehicleCode()), TaskHeader::getVehicleCode, taskHeader.getVehicleCode())
94 93 .like(StringUtils.isNotEmpty(taskHeader.getToLocation()), TaskHeader::getToLocation, taskHeader.getToLocation())
... ...
src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java
  View file @f0fe7d1
... ... @@ -453,13 +453,6 @@ public class TaskHeader implements Serializable {
453 453 private String batchNumber;
454 454  
455 455 /**
456   - * 领料单编码
457   - */
458   - /*@TableField(value = "shipmentReferCode")
459   - @ApiModelProperty(value = "领料单编码")
460   - private String shipmentReferCode;*/
461   -
462   - /**
463 456 * 记录任务执行，回传相关的信息
464 457 */
465 458 @TableField(value = "information")
... ...
src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
  View file @f0fe7d1
... ... @@ -17,6 +17,10 @@
17 17 <div class="select-list">
18 18 <ul>
19 19 <li>
  20 + <label>入库单编码：</label>
  21 + <input name="receiptCode" placeholder="请输入入库单编码" type="text"/>
  22 + </li>
  23 + <li>
20 24 <label>载具编码：</label>
21 25 <input name="containerCode" placeholder="请输入载具编码" type="text"/>
22 26 </li>
... ...
src/main/resources/templates/shipment/shipmentContainerHeader/shipmentContainerHeader.html
  View file @f0fe7d1
... ... @@ -17,6 +17,10 @@
17 17 <div class="select-list">
18 18 <ul>
19 19 <li>
  20 + <label>出库单编码：</label>
  21 + <input name="shipmentCode" placeholder="请输入出库单编码" type="text"/>
  22 + </li>
  23 + <li>
20 24 <label>载具编码：</label>
21 25 <input name="containerCode" placeholder="请输入载具编码" type="text"/>
22 26 </li>
... ... @@ -35,7 +39,7 @@
35 39 </select>
36 40 </li>
37 41 <li>
38   - <label>载具任务状态：</label>
  42 + <label>任务状态：</label>
39 43 <select name="status"
40 44 th:with="firstStatus=${@dict.getType('shipmentContainerHeaderStatus')}">
41 45 <option value="">所有</option>
... ...