优化流程

游杰
1 parent c1469e35
Showing 9 changed files with 78 additions and 29 deletions
src/main/java/com/huaheng/pc/config/containerType/domain/ContainerType.java
src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeServiceImpl.java
src/main/java/com/huaheng/pc/config/supplier/controller/SupplierController.java
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
src/main/resources/templates/receipt/receiptDetail/add.html
src/main/resources/templates/receipt/receiptHeader/add.html
@@ -42,6 +42,13 @@ public class ContainerType implements Serializable {
     private String warehouseCode;
  
     /**
+     * 库位类型
+     */
+    @TableField(value = "locationType")
+    @ApiModelProperty(value="库位类型")
+    private String locationType;
+
+    /**
      * 货主编码
      */
     @TableField(value = "companyCode")
@@ -800,6 +807,14 @@ public class ContainerType implements Serializable {
         this.processStamp = processStamp;
     }
  
+    public String getLocationType() {
+        return locationType;
+    }
+
+    public void setLocationType(String locationType) {
+        this.locationType = locationType;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -21,7 +21,8 @@ public class ReceiptTypeServiceImpl extends ServiceImpl&lt;ReceiptTypeMapper, Recei
         LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(StringUtils.isNotEmpty(ShiroUtils.getWarehouseCode()),ReceiptType::getWarehouseCode, ShiroUtils.getWarehouseCode())
                 .in(StringUtils.isNotEmpty(ShiroUtils.getCompanyCodeList()),ReceiptType::getCompanyCode, ShiroUtils.getCompanyCodeList());
-        return this.listMaps(lambdaQueryWrapper);
+        List<Map<String, Object>> list =  this.listMaps(lambdaQueryWrapper);
+        return list;
     }
  
     /**
@@ -168,17 +168,17 @@ public class SupplierController extends BaseController {
  
     @PostMapping("/getData")
     @ResponseBody
-    public Map<String, Object> getData(String name, String code) {
+    public Map<String, Object> getData(String supplierName, String supplierCode) {
         LambdaQueryWrapper<Supplier> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(StringUtils.isNotEmpty(name), Supplier::getCode, name)
+        queryWrapper.like(StringUtils.isNotEmpty(supplierName), Supplier::getCode, supplierName)
                 .or()
-                .like(StringUtils.isNotEmpty(name), Supplier::getName, name);
+                .like(StringUtils.isNotEmpty(supplierName), Supplier::getName, supplierName);
         List<Supplier> supplierList = supplierService.list(queryWrapper);
  
         List<Map<String, Object>> list = new ArrayList<>();
         for (Supplier supplier : supplierList) {
             Map<String, Object> resultMap = new HashMap<>();
-            if (StringUtils.isNotEmpty(code) && supplier.getCode().equals(code)) {
+            if (StringUtils.isNotEmpty(supplierCode) && supplier.getCode().equals(supplierCode)) {
                 resultMap.put("selected", true);
             }
             resultMap.put("id", supplier.getCode());
@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.mobile.receipt.ReceiptBill;
+import com.huaheng.pc.config.location.service.LocationService;
 import com.huaheng.pc.config.material.domain.Material;
 import com.huaheng.pc.config.material.service.MaterialService;
 import com.huaheng.common.constant.QuantityConstant;
@@ -52,6 +54,8 @@ public class ReceiptContainerDetailServiceImpl extends ServiceImpl&lt;ReceiptContai
     private ReceiptContainerHeaderService receiptContainerHeaderService;
     @Resource
     private MaterialService materialService;
+    @Resource
+    private LocationService locationService;
     /**
      * 根据入库单编码查询入库组盘明细
      * @param receiptCode 入库单编码
@@ -92,6 +96,10 @@ public class ReceiptContainerDetailServiceImpl extends ServiceImpl&lt;ReceiptContai
                 lambdaQueryWrapper.eq(ReceiptContainerDetail::getReceiptContainerId, receiptContainerDetail.getReceiptContainerId());
                 List<ReceiptContainerDetail> list = this.list(lambdaQueryWrapper);
                 if (list.size() == 0){
+                    String locationCode = receiptContainerDetail.getLocationCode();
+                    if(StringUtils.isNotEmpty(locationCode)) {
+                        locationService.updateStatus(locationCode, "empty");
+                    }
                     if (!receiptContainerHeaderService.removeById(receiptContainerDetail.getReceiptContainerId())){
                         throw new ServiceException("删除入库组盘头失败");
                     }
@@ -157,7 +157,6 @@ public class ReceiptContainerHeaderController extends BaseController {
             for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetails){
                 receivingService.position(receiptContainerDetail);
             }
-
         }
         return AjaxResult.success("定位成功");
     }
@@ -16,6 +16,8 @@ import com.huaheng.pc.config.configValue.domain.ConfigValue;
 import com.huaheng.pc.config.configValue.service.ConfigValueService;
 import com.huaheng.pc.config.container.domain.Container;
 import com.huaheng.pc.config.container.service.ContainerService;
+import com.huaheng.pc.config.containerType.domain.ContainerType;
+import com.huaheng.pc.config.containerType.service.ContainerTypeService;
 import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.service.LocationService;
 import com.huaheng.pc.config.locationType.domain.LocationType;
@@ -78,6 +80,8 @@ public class ReceivingService {
     private LocationTypeService locationTypeService;
     @Resource
     private TransferTaskService transferTaskService;
+    @Resource
+    private ContainerTypeService containerTypeService;
  
     /**
      * 获取当前单号详情
@@ -95,9 +99,19 @@ public class ReceivingService {
         return AjaxResult.success(detail);
     }
  
-    public String filter(List<Location> locationList, List<LocationType> locationTypeList, String roadway){
-        List<String> codeList = locationTypeList.stream().map(t-> t.getCode()).collect(Collectors.toList());
-        List<Location> newLocation = locationList.stream().filter(t-> codeList.contains(t.getLocationType()) && t.getRoadway().equals(roadway)).collect(Collectors.toList());
+    public String filter(List<Location> locationList, List<LocationType> locationTypeList, Container container){
+        String containerType1 = container.getContainerType();
+        LambdaQueryWrapper<ContainerType> containerTypeLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        containerTypeLambdaQueryWrapper.eq(ContainerType::getCode, containerType1);
+        ContainerType containerType = containerTypeService.getOne(containerTypeLambdaQueryWrapper);
+        String locationType = containerType.getLocationType();
+        String[] locationTypes = locationType.split(",");
+//        List<String> codeList = locationTypeList.stream().map(t-> t.getCode()).collect(Collectors.toList());
+        List<String> codeList = new ArrayList<>();
+        for(String type : locationTypes) {
+            codeList.add(type);
+        }
+        List<Location> newLocation = locationList.stream().filter(t-> codeList.contains(t.getLocationType())).collect(Collectors.toList());
         if (newLocation.isEmpty()){
             return null;
         } else{
@@ -146,7 +160,7 @@ public class ReceivingService {
         //根据定位规则查询库位编码
         LambdaQueryWrapper<Location> locationLambda = Wrappers.lambdaQuery();
         locationLambda.last(locatingRules[0]);
-        locationLambda.eq(Location::getRoadway, 3);
+        locationLambda.eq(Location::getWarehouseCode, ShiroUtils.getWarehouseCode());
         List<Location> locationList = locationService.list(locationLambda);
         List<Location> removeLocaationList = new ArrayList<>();
         for(Location location1 : locationList) {
@@ -172,9 +186,9 @@ public class ReceivingService {
         }
  
         LambdaQueryWrapper<LocationType> lambdaQueryWrapper2 = Wrappers.lambdaQuery();
-        lambdaQueryWrapper2.eq(LocationType::getCode, "L");
+//        lambdaQueryWrapper2.eq(LocationType::getCode, "L");
         List<LocationType> locationTypeList = locationTypeService.list(lambdaQueryWrapper2);
-        String locationCode = filter(locationList, locationTypeList, "3");
+        String locationCode = filter(locationList, locationTypeList, container);
  
         if (StringUtils.isNotEmpty(locationCode)){
             locationService.updateStatus(locationCode, "lock");
@@ -235,9 +249,13 @@ public class ReceivingService {
     public AjaxResult cancelPosition(ReceiptContainerDetail receiptContainerDetail){
         //查询入库组盘头
         ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(receiptContainerDetail.getReceiptContainerId());
-        if (!(receiptContainerHeader.getStatus().shortValue() == QuantityConstant.RECEIPT_CONTAINER_BUILD)){
+            if (!(receiptContainerHeader.getStatus().shortValue() == QuantityConstant.RECEIPT_CONTAINER_BUILD)){
             throw new ServiceException("组盘已生成任务不能取消定位");
         }
+        String locationCode = receiptContainerHeader.getToLocation();
+        if(StringUtils.isEmpty(locationCode)) {
+            throw new ServiceException("组盘没有定位，不需要取消定位");
+        }
         //将入库组盘头表中的而库位编码赋值null
         receiptContainerHeader.setToLocation("");
         if (!receiptContainerHeaderService.updateById(receiptContainerHeader)){
@@ -262,6 +280,8 @@ public class ReceivingService {
             throw new ServiceException("回滚入库明细状态失败");
         }
  
+        locationService.updateStatus(locationCode, "empty");
+
         receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
  
         return AjaxResult.success("取消定位成功");
@@ -88,9 +88,9 @@ public class TaskHeaderController extends BaseController {
             Page<TaskHeader> page = new Page<>(pageNum, pageSize);
             IPage<TaskHeader> iPage = taskHeaderService.page(page, lambdaQueryWrapper);
             List<TaskHeader> iPages = iPage.getRecords();
-            if(InternalTaskType == 700){
-                iPages = taskHeaderService.preferenceRealize(iPages) ;
-            }
+//            if(InternalTaskType == 700){
+//                iPages = taskHeaderService.preferenceRealize(iPages) ;
+//            }
             return getMpDataTable(iPages, iPage.getTotal());
         } else {
             List<TaskHeader> list = taskHeaderService.list(lambdaQueryWrapper);
@@ -34,12 +34,12 @@
                 <input id="totalQty" name="totalQty" class="form-control" type="text">
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">供应商编码：</label>
-            <div class="col-sm-8">
-                <input id="supplierCode" name="supplierCode" class="form-control" type="text">
-            </div>
-        </div>
+        <!--<div class="form-group">-->
+            <!--<label class="col-sm-3 control-label">供应商编码：</label>-->
+            <!--<div class="col-sm-8">-->
+                <!--<input id="supplierCode" name="supplierCode" class="form-control" type="text">-->
+            <!--</div>-->
+        <!--</div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label">批次：</label>
             <div class="col-sm-8">
 <!DOCTYPE HTML>
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org">
 <meta charset="utf-8">
-<head th:include="include :: header"></head>
+<head>
+    <th:block th:include="include :: header" />
+    <th:block th:include="include :: select2-css" />
+</head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-receiptHeader-add">
@@ -24,7 +27,7 @@
 			<div class="form-group">
 				<label class="col-sm-3 control-label">供应商：</label>
 				<div class="col-sm-8">
-					<select id="supplierName" name="supplierName" class="form-control"></select>
+					<select id="supplierName2" name="supplierName2" class="form-control"></select>
 				</div>
 			</div>
 			<div class="form-group">
@@ -47,7 +50,8 @@
 			</div>
 		</form>
 	</div>
-    <div th:include="include::footer"></div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: select2-js" />
     <script type="text/javascript">
 		var prefix = ctx + "receipt/receiptHeader";
  
@@ -58,6 +62,9 @@
 				},
                 companyCode:{
                     required:true,
+                },
+                supplierName2:{
+                    required:true,
                 }
             },
 			submitHandler: function(form) {
@@ -68,7 +75,7 @@
                     data : {
                         "receiptType": $("#receiptType option:selected").val(),
                         "companyCode": $("#companyCode option:selected").val(),
-						"supplierCode": $("input[name='supplierCode']").val(),
+						"supplierCode": $("#supplierName2 option:selected").val(),
                         "receiptNote": $("input[name='receiptNote']").val(),
                         "scheduledArriveDate": $("input[name='scheduledArriveDate']").val(),
                     },
@@ -88,15 +95,14 @@
                 var laydate = layui.laydate;
                 laydate.render({ elem: '#scheduledArriveDate',min: 0, theme: 'molv', format: 'yyyy-MM-dd HH:mm:ss'});
             });
-
-            $('#supplierName').select2({
+            $('#supplierName2').select2({
                 ajax: {
                     url: ctx+'config/supplier/getData',
                     dataType: 'json',
                     type: 'post',
                     data: function (params) {
                         let query = {
-                            supplierCode: params.term,
+                            supplierName: params.term,
                         }
                         return query;
                     }