Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop

肖超群
2 parents f487c48d 468cda1e
Showing 9 changed files with 108 additions and 61 deletions
ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue
ant-design-vue-jeecg/src/views/system/stocktaking/CycleCountDetailList.vue
ant-design-vue-jeecg/src/views/system/stocktaking/subTables/CycleCountDetailChildSubTable.vue
ant-design-vue-jeecg/src/views/system/task/TaskDetailList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/LocationAllocationService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/LocationAllocationServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -6,8 +6,7 @@
         <a-row :gutter="24">
           <a-col :xl='6' :lg='7' :md='8' :sm='24'>
             <a-form-item label='接口名称'>
-              <a-select show-search placeholder='请输入接口名称' option-filter-prop='children'
-                        v-model='queryParam.apiName'>
+              <a-select show-search placeholder='请输入接口名称' option-filter-prop='children' v-model='queryParam.apiName'>
                 <a-select-option v-for='name in apiNameList' :key='name' :value='name'>
                   {{ name }}
                 </a-select-option>
@@ -64,6 +63,11 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="Http Code">
+              <a-input placeholder="请输入 Http Code" v-model="queryParam.httpCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="响应耗时（毫秒）">
               <a-input placeholder="请输入大于响应耗时" v-model="queryParam.duration_begin"></a-input>
             </a-form-item>
@@ -72,10 +76,6 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
             </span>
           </a-col>
         </a-row>
@@ -86,10 +86,8 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button v-has="'apiLog:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button v-has="'apiLog:export'" type="primary" icon="download" @click="handleExportXls('接口日志')">导出
-      </a-button>
-      <j-super-query :fieldList="superFieldList" v-has="'apiLog:superQuery'"
-                     @handleSuperQuery="handleSuperQuery"/>
+      <a-button v-has="'apiLog:export'" type="primary" icon="download" @click="handleExportXls('接口日志')">导出</a-button>
+      <j-super-query :fieldList="superFieldList" v-has="'apiLog:superQuery'" @handleSuperQuery="handleSuperQuery"/>
     </div>
  
     <!-- table区域-begin -->
@@ -110,40 +108,22 @@
         <template :slot="expandedRowRender" slot-scope="record">
           <div style="margin: 0">
             <div>
-              <a-button @click="copyToClipboard(record.requestHeader)" type="link" icon="copy"
-                        style="vertical-align: revert;"></a-button>
-              <span
-                style="vertical-align: initial; word-break:break-all; white-space:pre-wrap; overflow:hidden; color:#b3b3b3;">请求头：</span>
-              <a-button @click="record.expandHeader = !record.expandHeader" type="link" icon="down-circle"
-                        style="vertical-align: revert;"></a-button>
-              <span v-if="record.expandHeader"
-                    style="padding:0 0 0 32px;display: block; vertical-align: initial; word-break:break-all; white-space:pre-wrap; overflow:hidden; color:#b3b3b3;">{{
-                  record.requestHeader
-                }}</span>
+              <a-button @click="copyToClipboard(record.requestHeader)" type="link" icon="copy" style="vertical-align: revert;"></a-button>
+              <span style="vertical-align: initial; word-break:break-all; white-space:pre-wrap; overflow:hidden; color:#b3b3b3;">请求头：</span>
+              <a-button @click="record.expandHeader = !record.expandHeader" type="link" icon="down-circle" style="vertical-align: revert;"></a-button>
+              <span v-if="record.expandHeader" style="padding:0 0 0 32px;display: block; vertical-align: initial; word-break:break-all; white-space:pre-wrap; overflow:hidden; color:#b3b3b3;">{{ record.requestHeader }}</span>
             </div>
             <div>
-              <a-button @click="copyToClipboard(record.requestBody)" type="link" icon="copy"
-                        style="vertical-align: revert;"></a-button>
-              <span
-                style="vertical-align: initial; word-break:break-all; white-space:pre-wrap; overflow:hidden; color: saddlebrown;">请求内容：{{
-                  record.requestBody
-                }}</span>
+              <a-button @click="copyToClipboard(record.requestBody)" type="link" icon="copy" style="vertical-align: revert;"></a-button>
+              <span style="vertical-align: initial; word-break:break-all; white-space:pre-wrap; overflow:hidden; color: saddlebrown;">请求内容：{{ record.requestBody }}</span>
             </div>
             <div>
-              <a-button @click="copyToClipboard(record.responseBody)" type="link" icon="copy"
-                        style="vertical-align: revert;"></a-button>
-              <span
-                style="vertical-align: initial; word-break:break-all; white-space:pre-wrap; overflow:hidden; color:#0066CC;">响应内容：{{
-                  record.responseBody
-                }}</span>
+              <a-button @click="copyToClipboard(record.responseBody)" type="link" icon="copy" style="vertical-align: revert;"></a-button>
+              <span style="vertical-align: initial; word-break:break-all; white-space:pre-wrap; overflow:hidden; color:#0066CC;">响应内容：{{ record.responseBody }}</span>
             </div>
             <div v-if="record.exception">
-              <a-button @click="copyToClipboard(record.exception)" type="link" icon="copy"
-                        style="vertical-align: revert;"></a-button>
-              <span
-                style="vertical-align: initial; word-break:break-all; white-space:pre-wrap; overflow:hidden; color:red">异常堆栈信息：{{
-                  record.exception
-                }}</span>
+              <a-button @click="copyToClipboard(record.exception)" type="link" icon="copy" style="vertical-align: revert;"></a-button>
+              <span style="vertical-align: initial; word-break:break-all; white-space:pre-wrap; overflow:hidden; color:red">异常堆栈信息：{{ record.exception }}</span>
             </div>
           </div>
         </template>
@@ -265,10 +245,17 @@ export default {
     }
   },
   methods: {
+    searchReset() {
+      let that = this;
+      Object.keys(that.queryParam).forEach(function (key) {
+        that.queryParam[key] = '';
+      });
+      that.queryParam['requestTime_begin'] = this.getDefaultDate()
+    },
     getDefaultDate() {
       var tempDate = new Date()
       tempDate.setDate(tempDate.getDate() - 7)
-      return moment(tempDate).utcOffset(480).format('YYYY-MM-DD HH:mm:ss');
+      return moment(tempDate).utcOffset(480).format('YYYY-MM-DD 00:00:00');
     },
     loadFrom() {
       getApiNameList().then((res) => {
@@ -77,8 +77,8 @@
           <cycle-count-detail-chi-id-modal ref="adjustmentModal" @ok="modalFormOk" :id="record.id"/>
           <a @click="createMany()"><a-icon/>新增</a>
           <a-divider type="vertical"/>
-          <a v-if="record.enableStatus === 1"  @click="selectPort(record)">生成盘点任务</a>
-          <a-divider v-if="record.enableStatus === 1"  type="vertical"/>
+          <a v-if="record.enableStatus == '1'"  @click="selectPort(record)">生成盘点任务</a>
+          <a-divider v-if="record.enableStatus == '1'"  type="vertical"/>
           <a @click="loadDatas(record.cycleCountHeadId)"><a-icon type="sync"/>刷新</a>
         </template>
  
@@ -23,7 +23,7 @@
  
     <template slot="action" slot-scope="text, record">
       <adjustment-doc-modal ref="adjustmentModal" @ok="modalFormOk"/>
-      <a v-if="record.childStatus != 1" @click="createMany(record.id)"><a-icon />实盘登记</a>
+      <a v-if="record.childStatus != 1" @click="createMany(record)"><a-icon />实盘登记</a>
     </template>
  
     <template slot="fileSlot" slot-scope="text">
@@ -80,7 +80,7 @@
  
         <span slot="action" slot-scope="text, record">
           <adjustment-doc-modal ref="adjustmentModal" @ok="modalFormOk" :id="record.id" :taskHeaderId="record.taskHeaderId"/>
-          <a v-if="record.taskType==700" @click="createMany(record)">实盘登记</a>
+          <a v-if="record.taskType==700" @click="createMany(record)">实盘登记<a-divider type="vertical" /></a>
           <a v-has="'taskDetail:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical" /></a>
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a v-has="'taskDetail:delete'">删除</a>
@@ -34,9 +34,10 @@ public interface LocationAllocationService {
      * 排除巷道，如果这个巷道分配了超过2个库位，那么就不往这边分库位了，避免堵死的情况
      * @param  roadWays
      * @param  warehouseCode
+     * @param warehouseCode2 
      * @return
      */
-    List<Integer> removeRoadWaysByPreLocations(List<Integer> roadWays, String warehouseCode);
+    List<Integer> removeRoadWaysByPreLocations(List<Integer> roadWays, String zoneCode, String warehouseCode);
  
     /**
      * 获取巷道，根据入库物料均分原则，选取物料最少的巷道
@@ -28,6 +28,7 @@ import org.jeecg.utils.StringUtils;
 import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -237,16 +238,15 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer getRoadWay(List<Integer> roadWays, String materialCode, String zoneCode, String warehouseCode) {
-        if (StringUtils.isEmpty(roadWays)) {
+        if (CollectionUtils.isEmpty(roadWays)) {
             throw new JeecgBootException("分配库位错误，没有巷道");
         }
         int roadWay = roadWays.get(0);
         if (roadWays.size() == 1) {
             return roadWay;
         }
-
-        roadWays = locationAllocationService.removeRoadWaysByPreLocations(roadWays, warehouseCode);
-        if (StringUtils.isEmpty(roadWays)) {
+        roadWays = locationAllocationService.removeRoadWaysByPreLocations(roadWays, zoneCode, warehouseCode);
+        if (CollectionUtils.isEmpty(roadWays)) {
             return roadWay;
         }
         // 获取巷道，选取空闲库位最多作为巷道
@@ -288,7 +288,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
  
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<Integer> removeRoadWaysByPreLocations(List<Integer> roadWays, String warehouseCode) {
+    public List<Integer> removeRoadWaysByPreLocations(List<Integer> roadWays, String zoneCode, String warehouseCode) {
         String value = parameterConfigurationService.getValueByCode(QuantityConstant.MAX_ROADWAY_RECEIPT);
         // 同巷道分配的库位大于等于2时，这个巷道就不能再分了
         int maxRoadReceipt = 2;
@@ -296,8 +296,8 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
             maxRoadReceipt = Integer.parseInt(value);
         }
         LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
-        taskHeaderLambdaQueryWrapper.lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED).ne(TaskHeader::getToLocationCode,
-            QuantityConstant.EMPTY_STRING);
+        taskHeaderLambdaQueryWrapper.lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED).eq(TaskHeader::getZoneCode, zoneCode)
+            .ne(TaskHeader::getToLocationCode, QuantityConstant.EMPTY_STRING);
         List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
         if (taskHeaderList.size() != 0) {
             List<Integer> roadWayList = taskHeaderList.stream().map(TaskHeader::getRoadWay).collect(toList());
@@ -321,14 +321,14 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
         }
         Collections.shuffle(roadWays);// 打乱巷道排序
         int roadWay = roadWays.get(0);
-        if (roadWays.size() == 1) {
-            return roadWay;
-        }
+//        if (roadWays.size() == 1) {
+//            return roadWay;
+//        }
+//        roadWays = locationAllocationService.removeRoadWaysByPreLocations(roadWays, zoneCode, warehouseCode);
+//        if (roadWays.size() == 0) {
+//            return roadWay;
+//        }
         int min = Integer.MAX_VALUE;
-        roadWays = locationAllocationService.removeRoadWaysByPreLocations(roadWays, warehouseCode);
-        if (roadWays.size() == 0) {
-            return roadWay;
-        }
         List<InventoryDetail> inventoryDetailList = inventoryDetailService.getInventoryDetailListByMaterialCodeAndZoneCode(materialCode, zoneCode, warehouseCode);
         if (inventoryDetailList.size() != 0) {
             List<Integer> roadWayList = inventoryDetailList.stream().map(InventoryDetail::getRoadWay).collect(toList());
@@ -4,9 +4,11 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
  
 import javax.annotation.Resource;
  
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.wms.config.container.entity.Container;
@@ -17,7 +19,9 @@ import org.jeecg.modules.wms.config.material.entity.Material;
 import org.jeecg.modules.wms.config.material.service.impl.MaterialServiceImpl;
 import org.jeecg.modules.wms.config.parameterConfiguration.service.IParameterConfigurationService;
 import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
+import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryHeader;
 import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
+import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryHeaderService;
 import org.jeecg.modules.wms.receipt.receiptContainerHeader.service.IReceiptContainerHeaderService;
 import org.jeecg.modules.wms.shipment.shipmentContainerHeader.service.IShipmentContainerHeaderService;
 import org.jeecg.modules.wms.stocktaking.cycleCountDetail.entity.CycleCountDetail;
@@ -79,6 +83,8 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
     private IReceiptContainerHeaderService receiptContainerHeaderService;
     @Resource
     private IShipmentContainerHeaderService shipmentContainerHeaderService;
+    @Resource
+    private IInventoryHeaderService inventoryHeaderService;
  
     @Override
     @Transactional
@@ -160,6 +166,10 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
             if (locationByCode.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
                 return Result.error("当前库位已锁定 请检查数据 库存里面不是锁定 实际上库位里面锁定了");
             }
+            InventoryHeader inventoryHeader = inventoryHeaderService.getById(taskId);
+            if (inventoryHeader == null) {
+                return Result.error("根据库存头ID：" + taskId + "没有找到库存头");
+            }
  
             CycleCountDetail cycleCountDetail = new CycleCountDetail();
             cycleCountDetail.setCycleCountHeadId(headerId);
@@ -170,9 +180,9 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
             cycleCountDetail.setInventoryHeaderId(inventoryDetails.get(0).getInventoryHeaderId());
             cycleCountDetail.setLocationCode(inventoryDetails.get(0).getLocationCode());
             cycleCountDetail.setInventorySts(inventoryDetails.get(0).getInventoryStatus());
-            cycleCountDetail.setSystemQty(BigDecimal.ZERO);
-            cycleCountDetail.setCountedQty(BigDecimal.ZERO);
-            cycleCountDetail.setGapQty(BigDecimal.ZERO);
+            cycleCountDetail.setSystemQty(inventoryHeader.getTotalQty());
+//            cycleCountDetail.setCountedQty(BigDecimal.ZERO);
+//            cycleCountDetail.setGapQty(BigDecimal.ZERO);
             cycleCountDetail.setEnableStatus(QuantityConstant.CYCLECOUNT_STATUS_BUILD);
             cycleCountDetailService.save(cycleCountDetail);
             for (InventoryDetail inventoryDetail : inventoryDetails) {
@@ -196,6 +206,24 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
                 cycleCountDetailChildServiceImpl.save(cycleCountDetailChild);
             }
         }
+        LambdaQueryWrapper <CycleCountDetail> cycleCountDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+        cycleCountDetailLambdaQueryWrapper.eq(CycleCountDetail::getCycleCountHeadCode, code);
+        List<CycleCountDetail> cycleCountDetailList = cycleCountDetailService.list(cycleCountDetailLambdaQueryWrapper);
+        if (CollectionUtils.isEmpty(cycleCountDetailList)) {
+            throw new JeecgBootException("没有找到盘点头信息");
+        }
+        BigDecimal countSystemQty = BigDecimal.ZERO;
+        List<BigDecimal> systemQty = cycleCountDetailList.stream().map(i -> i.getSystemQty()).collect(Collectors.toList());
+        for (BigDecimal bigDecimal : systemQty) {
+            countSystemQty = countSystemQty.add(bigDecimal);
+        }
+        CycleCountHeader cycleCountHeader = new CycleCountHeader();
+        cycleCountHeader.setId(cycleCountDetailList.get(0).getCycleCountHeadId());
+        cycleCountHeader.setTotalLocs(cycleCountDetailList.size());
+        cycleCountHeader.setTotalItems(countSystemQty);
+        if (!cycleCountHeaderService.updateById(cycleCountHeader)) {
+            throw new JeecgBootException("修改盘点头数量信息失败");
+        }
         return Result.OK("生成完成", headerId);
     }
  
@@ -330,6 +358,9 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         if (cycleCountDetail.getEnableStatus().equals(QuantityConstant.CYCLECOUNT_STATUS_BUILD)) {
             return Result.error("当前盘点明细是新建状态 不能调整");
         }
+        if (cycleCountDetail.getEnableStatus().equals(QuantityConstant.CYCLECOUNT_STATUS_COMPLETED)) {
+            return Result.error("当前盘点明细是完成状态 不能调整");
+        }
  
         if (cycleCountDetailChild.getCountedQty().compareTo(BigDecimal.ZERO) == 0) {
             return Result.error("别闹");
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
  
+import javafx.concurrent.Task;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.config.location.entity.Location;
 import org.jeecg.modules.wms.task.taskHeader.entity.QucikReceiptEntity;
@@ -310,6 +311,13 @@ public interface ITaskHeaderService extends IService&lt;TaskHeader&gt; {
     Result cancelShipmentTask(TaskHeader taskHeader);
  
     /**
+     * 修改盘点明细状态
+     * @param  taskHeader
+     * @return
+     */
+    Result updateCycleCountDetailByEnableStatus(TaskHeader taskHeader);
+
+    /**
      * 更新状态
      * @param  status
      * @param  id
@@ -910,6 +910,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             case QuantityConstant.TASK_TYPE_WHOLESHIPMENT:
             case QuantityConstant.TASK_TYPE_SORTINGSHIPMENT:
                 result = taskHeaderService.cancelShipmentTask(taskHeader);
+            case QuantityConstant.TASK_TYPE_CYCLECOUNT:
+                result = taskHeaderService.updateCycleCountDetailByEnableStatus(taskHeader);
                 break;
         }
         taskHeaderService.cancelLocationAndContainerStatus(taskHeader);
@@ -2772,6 +2774,24 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     }
  
     @Override
+    public Result updateCycleCountDetailByEnableStatus(TaskHeader taskHeader) {
+        log.info("开始取消盘点任务");
+        LambdaQueryWrapper<CycleCountDetail> cycleCountDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+        cycleCountDetailLambdaQueryWrapper.eq(CycleCountDetail::getContainerCode, taskHeader.getContainerCode())
+                .ne(CycleCountDetail::getEnableStatus, QuantityConstant.SHIPMENT_RECEIVE_SUCCESS);
+        CycleCountDetail cycleCountDetail = cycleCountDetailService.getOne(cycleCountDetailLambdaQueryWrapper);
+        if (cycleCountDetail == null) {
+            throw new JeecgBootException("取消盘点任务，没有找到盘点明细");
+        }
+        cycleCountDetail.setEnableStatus(QuantityConstant.CYCLECOUNT_STATUS_BUILD);
+        if (!cycleCountDetailService.updateById(cycleCountDetail)) {
+            throw new JeecgBootException("取消盘点任务，修改盘点明细状态失败");
+        }
+        log.info("完成取消盘点任务");
+        return Result.ok("取消盘点任务成功");
+    }
+
+    @Override
     public boolean updateStatusById(int status, int id) {
         TaskHeader taskHeader = new TaskHeader();
         taskHeader.setId(id);