add 移动端有表单入库

游杰
1 parent 5055f20a
Showing 3 changed files with 134 additions and 32 deletions
src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -3,6 +3,7 @@ package com.huaheng.mobile.receipt;
 import com.alibaba.fastjson.JSONException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.api.general.domain.Receipt;
 import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.api.general.domain.ReceiptDomain;
 import com.huaheng.common.constant.QuantityConstant;
@@ -30,6 +31,8 @@ import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
 import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
+import com.huaheng.pc.system.dict.domain.DictData;
+import com.huaheng.pc.system.dict.service.IDictDataService;
 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
@@ -42,9 +45,8 @@ import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
  
 /**
  *
@@ -77,6 +79,8 @@ public class MobileBatchReceiptController {
     private TaskDetailService taskDetailService;
     @Resource
     private CompanyService companyService;
+    @Resource
+    private IDictDataService dictDataService;
  
  
     @PostMapping("/scanContainer")
@@ -327,6 +331,70 @@ public class MobileBatchReceiptController {
         return AjaxResult.success("收货成功");
     }
  
+    @PostMapping("/listReceipt")
+    @ApiOperation("移动端根据表单整盘入库")
+    @Log(title = "移动端根据表单整盘入库", action = BusinessType.OTHER)
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult listReceipt(@RequestBody @ApiParam(value="收货单") List<ReceiptBill> receiptBills) throws Exception {
+        if (receiptBills == null || receiptBills.size() <=0) {
+            throw new JSONException("没有收货信息");
+        }
+        String containerCode = receiptBills.get(0).receiptContainerCode;
+        String companyCode = receiptBills.get(0).getCompanyCode();
+        String receiptDetailId = receiptBills.get(0).getReceiptDetailId();
+        String locationCode = receiptBills.get(0).locationCode;
+
+        LambdaQueryWrapper<Container> containerQueryWrapper = Wrappers.lambdaQuery();
+        containerQueryWrapper.eq(Container::getCode, containerCode);
+        Container container = containerService.getOne(containerQueryWrapper);
+        if(container == null) {
+            throw new JSONException("不存在这个托盘");
+        }
+
+        if(locationCode != null) {
+            LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
+            locationLambdaQueryWrapper.eq(Location::getCode, locationCode);
+            Location location = locationService.getOne(locationLambdaQueryWrapper);
+            if(location == null) {
+                throw new JSONException("不存在这个托盘");
+            }
+
+            if(!location.getStatus().equals("empty")) {
+                throw new JSONException("库位状态不是空闲");
+            }
+        }
+
+        LambdaQueryWrapper<ReceiptDetail> receiptDetailQueryWrapper = Wrappers.lambdaQuery();
+        receiptDetailQueryWrapper.eq(ReceiptDetail::getId, receiptDetailId);
+        ReceiptDetail receiptDetail = receiptDetailService.getOne(receiptDetailQueryWrapper);
+        if(receiptDetail == null) {
+            throw new JSONException("没有找到入库单详情");
+        }
+
+        LambdaQueryWrapper<ReceiptHeader> receiptHeaderQueryWrapper = Wrappers.lambdaQuery();
+        receiptHeaderQueryWrapper.eq(ReceiptHeader::getId, receiptDetail.getReceiptId());
+        ReceiptHeader receiptHeader = receiptHeaderService.getOne(receiptHeaderQueryWrapper);
+        if(receiptHeader == null) {
+            throw new JSONException("没有找到入库单");
+        }
+
+        List<ReceiptContainerView> receiptContainerViewList = new ArrayList<>();
+        for(ReceiptBill receiptBill : receiptBills) {
+            ReceiptContainerView receiptContainerView = new ReceiptContainerView();
+            receiptContainerView.setLocationCode(receiptBill.getLocationCode());
+            receiptContainerView.setCompanyCode(receiptBill.getCompanyCode());
+            receiptContainerView.setReceiptContainerCode(receiptBill.getReceiptContainerCode());
+            receiptContainerView.setReceiptDetailId(Integer.parseInt(receiptBill.getReceiptDetailId()));
+            receiptContainerView.setQty(receiptBill.getQty());
+            receiptContainerView.setTaskType((short)100);
+            receiptContainerViewList.add(receiptContainerView);
+        }
+        receiptContainerHeaderService.batchSave(receiptContainerViewList);
+        AjaxResult retResult = taskHeaderService.createQuickTask(containerCode);
+
+        return retResult;
+    }
+
     @PostMapping("/findReceipt")
     @ApiOperation("移动端查询入库单")
     @Log(title = "移动端查询入库单", action = BusinessType.OTHER)
@@ -338,9 +406,6 @@ public class MobileBatchReceiptController {
         } else if (StringUtils.isNull(companyCode)){
             return AjaxResult.error("公司编码为空");
         }
-//        else if (StringUtils.isNull(referType)) {
-//            return AjaxResult.error("上游系统关联单类型为空");
-//        }
  
         /* 查询入库单，如果数据库中不存在，则调用ERP接口拉取单据，成功后再次查询返回结果*/
          LambdaQueryWrapper<ReceiptHeader> receiptLambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -434,4 +499,36 @@ public class MobileBatchReceiptController {
  
         return AjaxResult.success(taskHeader.getId());
     }
+
+    @PostMapping("/searchReceipt")
+    @ApiOperation("移动端查询入库单")
+    @Log(title = "移动端查询入库单", action = BusinessType.OTHER)
+    public AjaxResult searchReceipt(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
+        String companyCode = param.get("companyCode");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String now = df.format(new Date());
+        Calendar c = Calendar.getInstance();
+        c.setTime(new Date());
+        c.add(Calendar.DATE, -7);
+        Date first = c.getTime();
+        String start = df.format(first);//前一天
+        LambdaQueryWrapper<ReceiptHeader> receiptHeaderQueryWrapper = Wrappers.lambdaQuery();
+        receiptHeaderQueryWrapper.eq(ReceiptHeader::getCompanyCode, companyCode)
+                .eq(ReceiptHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .le(ReceiptHeader::getCreated, now)
+                .gt(ReceiptHeader::getCreated, start);
+        List<ReceiptHeader> receiptHeaderList = receiptHeaderService.list(receiptHeaderQueryWrapper);
+        return AjaxResult.success(receiptHeaderList);
+    }
+
+    @PostMapping("/getDictListData")
+    @ApiOperation("移动端查询字典信息")
+    @Log(title = "移动端查询字典信息", action = BusinessType.OTHER)
+    public AjaxResult getDictListData(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
+        String dictType = param.get("dictType");
+        List<DictData> dictDataList = dictDataService.selectDictDataByType(dictType);
+        return AjaxResult.success(dictDataList);
+    }
+
+
 }
@@ -101,7 +101,10 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
             receiptContainerHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
             receiptContainerHeader.setCompanyCode(receiptDetail.getCompanyCode());
             receiptContainerHeader.setContainerCode(containerCode);
-            Container container = containerService.findAllByCode(containerCode);
+            Container condition = new Container();
+            condition.setCode(containerCode);
+            LambdaQueryWrapper<Container> containerHeaderQueryWrapper = Wrappers.lambdaQuery(condition);
+            Container container = containerService.getOne(containerHeaderQueryWrapper);
             receiptContainerHeader.setContainerType(container.getContainerType());
             receiptContainerHeader.setTaskType(String.valueOf(taskType));
             if (taskType.equals(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)) {
@@ -240,10 +243,12 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         if (checkLocationCode(list.get(0).getLocationCode(), list.get(0).getLocationCode(), Integer.valueOf(list.get(0).getTaskType())) == true) {
             locationService.updateStatus(list.get(0).getLocationCode(), "lock");
         }
-        ReceiptContainerView view = list.get(0);
-        AjaxResult ajaxResult = saveCountain(view.getReceiptCode(), view.getReceiptContainerCode(),
-                view.getReceiptDetailId(), view.getLocationCode(), view.getQty().intValue(), null);
-        return null;
+        AjaxResult ajaxResult = null;
+        for (ReceiptContainerView receiptContainerView : list) {
+            ajaxResult = saveCountain(receiptContainerView.getReceiptCode(), receiptContainerView.getReceiptContainerCode(),
+                    receiptContainerView.getReceiptDetailId(), receiptContainerView.getLocationCode(), receiptContainerView.getQty().intValue(), null);
+        }
+        return ajaxResult;
     }
  
     /**
@@ -362,33 +362,33 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         if (containerDetailList.isEmpty()) {
             throw new SecurityException("没有组盘明细，请先组盘");
         }
-        if (receiptContainerHeader.getStatus().equals(QuantityConstant.RECEIPT_HEADER_BUILD)) {
+        if (receiptContainerHeader.getStatus() == QuantityConstant.RECEIPT_HEADER_BUILD.shortValue()) {
             String ids = String.valueOf(receiptContainerHeader.getId());
             if (StringUtils.isEmpty(ids)){
                 return AjaxResult.error("id不能为空");
             }
             List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
-            for (int i = 0; i<idList.size(); i++){
-                LambdaQueryWrapper<ReceiptContainerDetail> lambda = Wrappers.lambdaQuery();
-                lambda.eq(ReceiptContainerDetail::getReceiptContainerId, idList.get(i));
-                List<ReceiptContainerDetail> receiptContainerDetails = receiptContainerDetailService.list(lambda);
-                for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetails){
-                    receivingService.position(receiptContainerDetail);
-                }
-
-            }
+//            for (int i = 0; i<idList.size(); i++){
+//                LambdaQueryWrapper<ReceiptContainerDetail> lambda = Wrappers.lambdaQuery();
+//                lambda.eq(ReceiptContainerDetail::getReceiptContainerId, idList.get(i));
+//                List<ReceiptContainerDetail> receiptContainerDetails = receiptContainerDetailService.list(lambda);
+//                for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetails){
+//                    receivingService.position(receiptContainerDetail);
+//                }
+//
+//            }
             if (StringUtils.isEmpty(ids)){
                 return AjaxResult.error("id不能为空");
             }
-            for (int i = 0; i<idList.size(); i++){
-                LambdaQueryWrapper<ReceiptContainerDetail> lambda = Wrappers.lambdaQuery();
-                lambda.eq(ReceiptContainerDetail::getReceiptContainerId, idList.get(i));
-                List<ReceiptContainerDetail> receiptContainerDetails = receiptContainerDetailService.list(lambda);
-                for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetails){
-                    receivingService.position(receiptContainerDetail);
-                }
-
-            }
+//            for (int i = 0; i<idList.size(); i++){
+//                LambdaQueryWrapper<ReceiptContainerDetail> lambda = Wrappers.lambdaQuery();
+//                lambda.eq(ReceiptContainerDetail::getReceiptContainerId, idList.get(i));
+//                List<ReceiptContainerDetail> receiptContainerDetails = receiptContainerDetailService.list(lambda);
+//                for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetails){
+//                    receivingService.position(receiptContainerDetail);
+//                }
+//
+//            }
  
             Integer maxId = idList.stream().max(Comparator.comparing(Integer::intValue)).orElse(null);
  
@@ -398,7 +398,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                     .le(ReceiptContainerHeader::getId, maxId);
             return taskHeaderService.createReceiptTask(idList);
         }
-        return null;
+        return AjaxResult.error("生成入库任务失败");
     }
  
     /**
@@ -1526,7 +1526,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 }
             }
         }
-        return AjaxResult.success("生成上架任务成功！");
+        return AjaxResult.success("生成上架任务成功");
     }
  
     /**