合并代码--待测试2

huhai
1 parent 3ea66fdf
Showing 5 changed files with 46 additions and 171 deletions
huaheng.iml
src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java
src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java
src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -114,7 +114,6 @@
     <orderEntry type="library" name="Maven: org.springframework.session:spring-session-core:2.0.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.0.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.5.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.9" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-mail:2.0.3.RELEASE" level="project" />
@@ -126,6 +125,8 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.testng:testng:7.0.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.3.RELEASE" level="project" />
@@ -161,21 +162,25 @@
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.16" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.16" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.16" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.14.Final" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.1.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.undertow:undertow-core:2.0.17.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.3.8.Final" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.xnio:xnio-nio:3.3.8.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.undertow:undertow-servlet:2.0.17.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.undertow:undertow-websockets-jsr:2.0.17.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec:1.1.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:javax.el:3.0.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.11.RELEASE" level="project" />
@@ -194,8 +199,8 @@
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.12" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.10" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.18" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.18" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.21" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.21" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
@@ -208,7 +213,6 @@
     <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.4.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.4.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.4.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.4.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.1" level="project" />
@@ -231,7 +235,6 @@
     <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
@@ -246,11 +249,33 @@
     <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.12.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
     <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.jasperreports:jasperreports:6.10.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.lowagie:itext:2.1.7.js7" level="project" />
+    <orderEntry type="library" name="Maven: org.jfree:jcommon:1.0.23" level="project" />
+    <orderEntry type="library" name="Maven: org.jfree:jfreechart:1.0.19" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jdt.core.compiler:ecj:4.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.castor:castor-xml:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.castor:castor-core:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.jasperreports:jasperreports-fonts:6.10.0" level="project" />
+    <orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.7" level="project" />
+    <orderEntry type="library" name="Maven: com.itextpdf:itext-pdfa:5.5.7" level="project" />
+    <orderEntry type="library" name="Maven: com.itextpdf:itext-asian:5.2.0" level="project" />
+    <orderEntry type="library" name="Maven: cn.lesper:iTextAsian:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.groovy:groovy-all:2.4.11" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.5.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.7" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.11" level="project" />
@@ -263,8 +288,10 @@
     <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.0.0" level="project" />
     <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.testng:testng:7.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.testng:testng:7.1.0" level="project" />
     <orderEntry type="library" name="Maven: com.beust:jcommander:1.72" level="project" />
+    <orderEntry type="library" name="Maven: com.google.inject:guice:no_aop:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.2" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.1.2" level="project" />
@@ -278,5 +305,8 @@
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.1.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jai-imageio:jai-imageio-core:1.3.1" level="project" />
   </component>
 </module>
 \ No newline at end of file
@@ -42,6 +42,7 @@ 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;
  
-package com.huaheng.pc.general.container.controller;
+package com.huaheng.pc.config.container.controller;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,6 +19,7 @@ import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailServiceImpl;
 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import com.huaheng.pc.shipment.shippingCombination.service.ShippingCombinationService;
+import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -1675,162 +1675,5 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
  
     }
  
-    /**
-     * 移动端根据容器编码获取盘点任务
-     * @param containerCode 容器编码
-     * @return
-     */
-    @Override
-    public List<MobileTask> mobileFindTransferTask(String containerCode) {
-        /* 查询该容器未完成的盘点任务明细*/
-        LambdaQueryWrapper<TaskDetail> detailLambdaQueryWrapper = Wrappers.lambdaQuery();
-        detailLambdaQueryWrapper.eq(TaskDetail::getContainerCode, containerCode)
-                .eq(TaskDetail::getTaskType, QuantityConstant.TASK_TYPE_CYCLECOUNT)
-                .ne(TaskDetail::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
-        List<TaskDetail> taskDetailList = taskDetailService.list(detailLambdaQueryWrapper);
-
-        /* 获取任务明细中的任务头id*/
-        List<Integer> headerIdList = taskDetailList.stream().map(TaskDetail::getTaskId).collect(Collectors.toList());
-        List<MobileTask> mobileTasks = new ArrayList<>();
-
-        /* 遍历id查询出盘点任务*/
-        for (Integer id : headerIdList) {
-            TaskHeader taskHeader = taskHeaderService.getById(id);
-            MobileTask mobileTask = new MobileTask();
-            mobileTask.setTaskHeader(taskHeader);
-            LambdaQueryWrapper<TaskDetail> queryWrapper = Wrappers.lambdaQuery();
-            queryWrapper.eq(TaskDetail::getTaskId, id)
-                    .eq(TaskDetail::getContainerCode, containerCode);
-            List<TaskDetail> taskDetails = taskDetailService.list(queryWrapper);
-            mobileTask.setTaskDetail(taskDetails);
-            mobileTasks.add(mobileTask);
-        }
-        return mobileTasks;
-    }
-
-    /**
-     * 容器收货上架
-     *
-     * @param containerCode
-     * @return
-     */
-    @Override
-    public AjaxResult createQuickTask(String containerCode) {
-        LambdaQueryWrapper<ReceiptContainerHeader> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(ReceiptContainerHeader::getContainerCode, containerCode)
-                .eq(ReceiptContainerHeader::getStatus, QuantityConstant.RECEIPT_CONTAINER_BUILD)
-                .eq(ReceiptContainerHeader::getWarehouseCode, ShiroUtils.getWarehouseCode());
-        ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getOne(queryWrapper);
-        if (receiptContainerHeader == null) {
-            throw new ServiceException("该容器没有任务！");
-        }
-
-        LambdaQueryWrapper<ReceiptContainerDetail> containerDetailQueryWrapper = Wrappers.lambdaQuery();
-        containerDetailQueryWrapper.eq(ReceiptContainerDetail::getReceiptContainerId, receiptContainerHeader.getId())
-                .eq(ReceiptContainerDetail::getStatus, QuantityConstant.RECEIPT_CONTAINER_BUILD)
-                .eq(ReceiptContainerDetail::getContainerCode, containerCode);
-        List<ReceiptContainerDetail> containerDetailList = receiptContainerDetailService.list(containerDetailQueryWrapper);
-        if (containerDetailList.isEmpty()) {
-            throw new SecurityException("没有组盘明细，请先组盘");
-        }
-        if (receiptContainerHeader.getStatus().equals(QuantityConstant.RECEIPT_HEADER_BUILD)) {
-            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);
-                }
-
-            }
-            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);
-                }
-
-            }
-
-            Integer maxId = idList.stream().max(Comparator.comparing(Integer::intValue)).orElse(null);
-
-            LambdaQueryWrapper<ReceiptContainerHeader> lambda = Wrappers.lambdaQuery();
-            lambda.select(ReceiptContainerHeader::getId)
-                    .lt(ReceiptContainerHeader::getStatus, 10)
-                    .le(ReceiptContainerHeader::getId, maxId);
-            return taskHeaderService.createReceiptTask(idList);
-        }
-        return null;
-    }
-
-    /**
-     * 根据库位完成任务
-     *
-     * @param locationCode
-     * @return
-     * @throws Exception
-     */
-    @Override
-    public AjaxResult completeTask(String locationCode) throws Exception {
-        LambdaQueryWrapper<TaskHeader> taskQueryWrapper = Wrappers.lambdaQuery();
-        taskQueryWrapper.eq(TaskHeader::getToLocation, locationCode);
-        List<TaskHeader> list = this.list(taskQueryWrapper);
-        if (list.size() < 1) {
-            throw new ServiceException("库位(" + locationCode + ")没有任务！");
-        } else if(list.get(0).getStatus() == 100) {
-            //如果已完成则不管
-            throw new ServiceException("库位(" + locationCode + ")任务已经完成！");
-        }
-        if(list.get(0).getTaskType()==100 || list.get(0).getTaskType()==200){
-            //入库任务
-            return  completeReceiptTask((list.get(0)));
-        } else {
-            throw new ServiceException("库位(" + locationCode + ")的任务不是上架，不能完成！");
-        }
-    }
-
-    @Override
-    public AjaxResult createReplenishTask(String containerCode, Short taskStatus) {
-        LambdaQueryWrapper<ReceiptContainerHeader> headerQueryWrapper = Wrappers.lambdaQuery();
-        headerQueryWrapper.eq(ReceiptContainerHeader::getContainerCode, containerCode)
-                .eq(ReceiptContainerHeader::getStatus, QuantityConstant.RECEIPT_CONTAINER_BUILD);
-
-        List<ReceiptContainerHeader> receiptContainerHeaderList = receiptContainerHeaderService.list(headerQueryWrapper);
-        if (receiptContainerHeaderList.isEmpty()) {
-            throw new ServiceException("该容器没有任务！");
-        }
-        if (receiptContainerHeaderList.size() > 1){
-            throw new ServiceException("该容器存在多条任务");
-        }
-        if (receiptContainerHeaderList.get(0).getWarehouseCode() != ShiroUtils.getWarehouseCode()) {
-            throw new ServiceException("容器不在当前仓库！");
-        }
-        LambdaQueryWrapper<ReceiptContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(ReceiptContainerDetail::getReceiptContainerId, receiptContainerHeaderList.get(0).getId());
-        List<ReceiptContainerDetail> containerDetailList = receiptContainerDetailService.list(lambdaQueryWrapper);
-        ReceiptContainerHeader containerHeader = receiptContainerHeaderList.get(0);
-        if (containerDetailList.isEmpty()){
-            throw new ServiceException("没有组盘明细，请先组盘！");
-        }
-        if (containerHeader.getStatus().equals(QuantityConstant.TASK_STATUS_BUILD)) {
-            if (containerHeader.getStatus().intValue() != taskStatus.intValue()) {
-                containerHeader.setStatus(taskStatus);
-                receiptContainerHeaderService.updateById(containerHeader);
-            }
-        }
-        List<Integer> ids = new ArrayList<>();
-        ids.add(containerHeader.getId());
-        createReceiptTask(ids);
-        return null;
-    }
  
 }
 \ No newline at end of file