1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WarehouseBaseInfoController.java

@@ -72,6 +72,14 @@ public class WarehouseBaseInfoController {
     public List<WarehouseBaseInfo> selectWarehouseSelf(@RequestParam String compId, String personCharge) {
         return warehouseBaseInfoService.selectWarehouseSelf(compId, personCharge);
     }
+    /**
+     * 查看自己负责的常用仓库New
+     * 公司ID,手机号
+     */
+    @GetMapping("/selectWarehouseSelfNew")
+    public List<WarehouseBaseInfo> selectWarehouseSelfNew(@RequestParam String compId, String personCharge) {
+        return warehouseBaseInfoService.selectWarehouseSelfNew(compId, personCharge);
+    }
 
     /**
      * 查看自己负责的常用仓库

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IWarehouseBaseInfoService.java

@@ -116,6 +116,13 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
      * @return
      */
     List<WarehouseBaseInfo> selectWarehouseSelf(String compId, String personCharge);
+    /**
+     * 查看自己负责的常用仓库
+     *
+     * @param compId
+     * @return
+     */
+    List<WarehouseBaseInfo> selectWarehouseSelfNew(String compId, String personCharge);
 
     /**
      * 查看自己负责的常用仓库

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -1257,6 +1257,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     contractManagementInfo.setStatusFlag(StatusEnum.CONTRACT_COMPLETED.getFlag());
                     contractManagementInfo.setStatus(StatusEnum.CONTRACT_COMPLETED.getName());
                     contractManagementInfo.setSettlementPrice(settlementPrice);
+                    if ("2".equals(contractManagementInfo.getContractType()) && "1".equals(contractManagementInfo.getDeliverType())) {
+                        //临时仓库信息
+                        WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                                .eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, contractManagementInfo.getContractNo())
+                                .eq("comp_id",contractManagementInfo.getCompId()));
+                        if (warehouseBaseInfo!=null){
+                            warehouseBaseInfo.setOtherPersonCharge("");
+                            warehouseBaseInfo.setOtherPersonPhone("");
+                            warehouseBaseInfoService.updateById(warehouseBaseInfo);
+                        }
+                    }
                 }
                 List<InOutWarehouseTask> inOutWarehouseTaskList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
                         .eq("comp_id", contractManagementInfo.getCompId())
@@ -1271,6 +1282,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             } else if(StatusEnum.END_OF_SHIPMENT.getFlag().equals(contractManagementInfo.getStatusFlag())){
                 contractManagementInfo.setStatusFlag(StatusEnum.CONTRACT_COMPLETED.getFlag());
                 contractManagementInfo.setStatus(StatusEnum.CONTRACT_COMPLETED.getName());
+                if ("2".equals(contractManagementInfo.getContractType()) && "1".equals(contractManagementInfo.getDeliverType())) {
+                    //临时仓库信息
+                    WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                            .eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, contractManagementInfo.getContractNo())
+                            .eq("comp_id",contractManagementInfo.getCompId()));
+                    if (warehouseBaseInfo!=null){
+                        warehouseBaseInfo.setOtherPersonCharge("");
+                        warehouseBaseInfo.setOtherPersonPhone("");
+                        warehouseBaseInfoService.updateById(warehouseBaseInfo);
+                    }
+                }
             }
             else {
                 contractManagementInfo.setStatusFlag(StatusEnum.CONTRACT_DO.getFlag());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -1789,6 +1789,55 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         return warehouseBaseInfoList;
     }
 
+    @Override
+    public List<WarehouseBaseInfo> selectWarehouseSelfNew(String compId, String personCharge) {
+        if (compId == null || compId.isEmpty()) {
+            compId = AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId();
+        }
+        if (personCharge == null || personCharge.isEmpty()) {
+            personCharge = AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffMobilePhone();
+        }
+        List<WarehouseBaseInfo> listRedis = cacheComponent.getObjList(Const.SELF_WAREHOUSE + personCharge + compId, WarehouseBaseInfo.class);
+        if (listRedis != null && listRedis.size() > 0) {
+            return listRedis;
+        }
+        Wrapper<WarehouseBaseInfo> warehouseBaseInfoWrapper = new EntityWrapper<>();
+        warehouseBaseInfoWrapper.eq("comp_id", compId)
+                .orderBy("warehouse_type", true).eq("delete_flag", "0");
+        warehouseBaseInfoWrapper.andNew().eq("person_phone", personCharge).or()
+                .like("other_person_charge", personCharge);
+        List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(warehouseBaseInfoWrapper);
+        if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
+            for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
+                // 以库位为维度查询
+                List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
+                        .eq("base_id", warehouseBaseInfo.getId()).orderBy("bin_number", false));
+                if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
+                    warehouseBaseInfo.setPositionInfos(warehousePositionInfos);
+                }
+            }
+
+        }
+        else{
+            List<WarehouseBaseInfo> warehouseBaseInfoList1 = this.selectList(new EntityWrapper<WarehouseBaseInfo>()
+                    .eq("comp_id", compId)
+                    .eq("delete_flag", "0")
+                    .orderBy("warehouse_type"));
+            for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList1) {
+                warehouseBaseInfo.setFlag("全部");
+                // 以库位为维度查询
+                List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
+                        .eq("base_id", warehouseBaseInfo.getId()).orderBy("bin_number", false));
+                if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
+                    warehouseBaseInfo.setPositionInfos(warehousePositionInfos);
+                }
+                warehouseBaseInfoList.add(warehouseBaseInfo);
+            }
+        }
+        cacheComponent.putRaw(Const.SELF_WAREHOUSE + personCharge + compId, JSONObject.toJSONString(warehouseBaseInfoList), 60 * 60 * 24);
+        return warehouseBaseInfoList;
+    }
+
     @Override
     public WarehouseInOutInfo getPrintInfo(String id) {
         WarehouseInOutInfo warehouseInOutInfo = warehouseInOutInfoService.selectById(id);