wms / wms_shandonghaiwang · Commits

Commit ab2efe7e50980e4c105da5978eb91fe00ab4441b

Authored by 易文鹏
1 parent 6ebc9994

feat:自建库位不能呼叫料盒

Inline Side-by-side
Showing 5 changed files with 16 additions and 11 deletions
src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java
  View file @ab2efe7
... ... @@ -619,7 +619,10 @@ public class MobileBatchReceiptController {
619 619 if (count > 0) {
620 620 return AjaxResult.error("该托盘已经用于出库组盘");
621 621 }
622   -
  622 + //自建库位不能呼叫料盒
  623 + if (location.getSelfCreated()) {
  624 + return AjaxResult.error("自建库位不能呼叫料盒");
  625 + }
623 626 //创建主任务
624 627 TaskHeader taskHeader = new TaskHeader();
625 628 taskHeader.setWarehouseCode(location.getWarehouseCode());
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @ab2efe7
... ... @@ -179,7 +179,7 @@ public class ReceiptHeaderController extends BaseController {
179 179 //ReceiptHeader receiptHeaderData = new ReceiptHeader();
180 180 ReceiptDetail receiptDetail = receiptDetailService.getOne(new LambdaQueryWrapper<ReceiptDetail>().eq(ReceiptDetail::getSNNO, receiptHeader.getSNNO()));
181 181 if (receiptDetail == null) {
182   - receiptDetail = receiptDetailService.getOne(new LambdaQueryWrapper<ReceiptDetail>().like(ReceiptDetail::getReceiptCode, receiptHeader.getSNNO()));
  182 + receiptDetail = receiptDetailService.getOne(new LambdaQueryWrapper<ReceiptDetail>().eq(ReceiptDetail::getReceiptCode, receiptHeader.getSNNO()));
183 183 if (receiptDetail == null) {
184 184 return AjaxResult.error("该SN或入库单号不存在");
185 185 }
... ...
src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentPrintVo.java
  View file @ab2efe7
... ... @@ -43,11 +43,7 @@ public class ShipmentPrintVo {
43 43 }
44 44  
45 45  
46   - @Resource
47   - private TaskHeaderService taskHeaderService;
48   -
49   - public ShipDetail addShipDetail(TaskDetail taskDetail, String roadway) {
50   - TaskHeader taskHeader = taskHeaderService.getById(taskDetail.getTaskId());
  46 + public ShipDetail addShipDetail(TaskDetail taskDetail, String roadway, String port) {
51 47 ShipDetail voDetail = new ShipDetail();
52 48 if (taskDetail.getFlat() == null || taskDetail.getFlat() != 1) {
53 49 voDetail.containerCode = taskDetail.getContainerCode();
... ... @@ -65,7 +61,7 @@ public class ShipmentPrintVo {
65 61 voDetail.taskId = String.valueOf(taskDetail.getTaskId());
66 62 voDetail.roadway = roadway;//巷道
67 63 voDetail.recordCode = taskDetail.getRecordCode();//合并前单号
68   - voDetail.port = taskHeader.getPort();//出库口
  64 + voDetail.port = port;//出库口
69 65 voDetail.materialColor = taskDetail.getMaterialColor();//颜色
70 66 voDetail.paintStatus = taskDetail.getPaintStatus();//喷漆状态
71 67 data.details.add(voDetail);
... ...
src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java
  View file @ab2efe7
... ... @@ -39,6 +39,8 @@ import com.huaheng.pc.shipment.shipmentHeaderHistory.service.ShipmentHeaderHisto
39 39 import com.huaheng.pc.system.dict.service.IDictDataService;
40 40 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
41 41 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
  42 +import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
  43 +import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
42 44 import org.springframework.beans.BeanUtils;
43 45 import org.springframework.beans.factory.annotation.Autowired;
44 46 import org.springframework.http.ResponseEntity;
... ... @@ -642,6 +644,8 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
642 644 return AjaxResult.success();
643 645 }
644 646  
  647 + @Resource
  648 + private TaskHeaderService taskHeaderService;
645 649  
646 650 public AjaxResult executeReport(String version, ShipmentHeader shipmentHeader, List<TaskDetail> taskDetails, String unionCode, String zoneInfo, int currentPageEndIndex) {
647 651 //分页打印
... ... @@ -670,12 +674,15 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
670 674 if (location != null) {
671 675 roadway = location.getRoadway();
672 676 }
  677 + TaskHeader taskHeader = taskHeaderService.getById(taskDetail.getTaskId());
  678 + String port = taskHeader.getPort();
673 679 InventoryDetail inventory = new InventoryDetail();
674 680 inventory.setWarehouseCode(taskDetail.getWarehouseCode());
675 681 inventory.setMaterialCode(taskDetail.getMaterialCode());
676 682 inventory.setInventorySts(taskDetail.getInventorySts());
677 683 inventory.setContainerCode(taskDetail.getContainerCode());
678   - vo.addShipDetail(taskDetail, roadway).invQty = inventoryDetailService.getSumQty(inventory).stripTrailingZeros().toPlainString();
  684 +
  685 + vo.addShipDetail(taskDetail, roadway, port).invQty = inventoryDetailService.getSumQty(inventory).stripTrailingZeros().toPlainString();
679 686 });
680 687  
681 688 String url;
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @ab2efe7
... ... @@ -830,8 +830,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
830 830 public List<TaskHeader> getUnCompleteTaskList() {
831 831 LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
832 832 taskHeaderLambdaQueryWrapper.lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
833   - List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
834   - return taskHeaderList;
  833 + return taskHeaderService.list(taskHeaderLambdaQueryWrapper);
835 834 }
836 835  
837 836 @Override
... ...