1

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

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.yh.saas.plugin.yiliangyiyun.entity.SourceRelationInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehousingOrder;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.PaymentView;
 import com.yh.saas.plugin.yiliangyiyun.service.IWarehousingOrderService;
@@ -34,12 +35,12 @@ public class WarehousingOrderController {
 
     /**
      * 退库货源列表
-     * @param warehousingOrder
+     * @param warehouseInOutInfo
      * @return
      */
     @GetMapping("/getSourceOfGoodsList")
-    public List<SourceRelationInfo> getReturnSourceList(WarehousingOrder warehousingOrder){
-        return warehousingOrderService.getReturnSourceList(warehousingOrder);
+    public Page<SourceRelationInfo> getReturnSourceList(WarehouseInOutInfo warehouseInOutInfo){
+        return warehousingOrderService.getReturnSourceList(warehouseInOutInfo);
     }
     /**
      * 出库货源列表

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/InOutWarehouseTask.java

@@ -274,6 +274,11 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
     private String taskId;
     @TableField(exist = false)
     private String flag;
+    /**
+     * 退库勾选标识（0未勾选1已勾选2已退库）
+     */
+    @TableField(exist = false)
+    private String returnTickFlag;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SourceRelationInfo.java

@@ -44,6 +44,10 @@ public class SourceRelationInfo extends BaseModel<SourceRelationInfo> {
      * 货源id
      */
     private String sourceId;
+    /**
+     * 出入库记录id
+     */
+    private String warehouseInOutId;
     /**
      * 货源
      */
@@ -90,15 +94,9 @@ public class SourceRelationInfo extends BaseModel<SourceRelationInfo> {
      * 出货库
      */
     private String warehouseName;
-    /**
-     * 出入库id
-     */
-    @TableField(exist = false)
-    private String warehouseInOutId;
     /**
      * 退库勾选标识（0未勾选1已勾选）
      */
-    @TableField(exist = false)
     private String returnTickFlag;
     /**
      * 货源关联列表

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseInOutInfo.java

@@ -241,7 +241,7 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
      */
     private String contractNo;
     /**
-     * 退库勾选标识（0未勾选1已勾选）
+     * 退库勾选标识（0未勾选1已勾选2已退库）
      */
     private String returnTickFlag;
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/YExceptionEnum.java

@@ -40,6 +40,7 @@ public enum YExceptionEnum {
 	PAYMENT_NOT_DELETED_ERROR("ERROR", "请先删除对应的付款信息！"),
 	WEIGHT_NOT_DELETED_ERROR("ERROR", "请先删除对应的检斤信息！"),
 	QUALITY_NO_ERROR("ERROR", "业务编号已存在，不可重复！"),
+	QUALITY_HAVE_ERROR("ERROR", "业务编号错误，请重新添加！"),
 	TARE_NULL("ERROR", "皮重不能为空！"),
 	GROSSWEIGHT_NULL("ERROR", "毛重不能为空！"),
 	IN_WEIGHT_STATUS_ERROR("ERROR", "入库检斤《已称皮重》状态不允许删除，请先退回！"),

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

@@ -23,9 +23,9 @@ public interface IWarehousingOrderService extends IService<WarehousingOrder> {
 
     /**
      * 退库货源列表
-     * @param warehousingOrder
+     * @param warehouseInOutInfo
      */
-    List<SourceRelationInfo> getReturnSourceList(WarehousingOrder warehousingOrder);
+    Page<SourceRelationInfo> getReturnSourceList(WarehouseInOutInfo warehouseInOutInfo);
 
     /**
      * 信息分页列表查询

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

@@ -1,6 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
 import com.yh.saas.plugin.yiliangyiyun.mapper.ContractGoodsInfoMapper;
@@ -47,7 +48,9 @@ public class ContractGoodsInfoServiceImpl extends ServiceImpl<ContractGoodsInfoM
         if(inOutWarehouseTask!=null) {
             ContractGoodsInfo contractGoodsInfo1=new ContractGoodsInfo();
             contractGoodsInfo1.setWeight(inOutWarehouseTask.getWeight());
-            contractGoodsInfo1.setUnitContractPrice(Double.valueOf(String.valueOf(inOutWarehouseTask.getUnitPrice())));
+            if(inOutWarehouseTask.getUnitPrice()!=null) {
+                contractGoodsInfo1.setUnitContractPrice(Double.valueOf(String.valueOf(inOutWarehouseTask.getUnitPrice())));
+            }
             contractGoodsInfo1.setGoodsName(inOutWarehouseTask.getGoodsName());
             contractGoodsInfo1.setBulkDensity(inOutWarehouseTask.getBulkDensity());
             contractGoodsInfo1.setWaterContent(inOutWarehouseTask.getWaterContent());

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

@@ -315,6 +315,9 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
     public String addQualityInspection(QualityInspectionManagement qualityInspectionManagement) {
         String relationId=IdGenerator.generateUUID();
         qualityInspectionManagement.setId(IdGenerator.generateUUID());
+        if(qualityInspectionManagement.getQualityNo().contains("null")){
+            throw new YException(YExceptionEnum.QUALITY_HAVE_ERROR);
+        }
         if(qualityInspectionManagement.getCompId() == null || qualityInspectionManagement.getCompId().isEmpty()){
             qualityInspectionManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
         }

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

@@ -1442,6 +1442,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 ContractManagementInfo contractManagementInfo = new ContractManagementInfo();
                 BeanUtils.copyProperties(inOutWarehouseTask, contractManagementInfo);
                 contractManagementInfo.setContractNo(inOutWarehouseTask.getMoveTaskNo());
+                contractManagementInfo.setInOutType("移库入库");
                 temp.add(contractManagementInfo);
             }
             return temp;

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

@@ -106,46 +106,54 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
 
     /**
      * 退库货源列表
-     * @param warehousingOrder
+     * @param warehouseInOutInfo
      */
     @Override
-    public List<SourceRelationInfo> getReturnSourceList(WarehousingOrder warehousingOrder) {
+    public Page<SourceRelationInfo> getReturnSourceList(WarehouseInOutInfo warehouseInOutInfo) {
+        Page<SourceRelationInfo> sourceRelationInfoPage = new Page<>();
         List<SourceRelationInfo> sourceRelationInfoList=new ArrayList<>();
         Wrapper<WarehouseInOutInfo> warehouseInOutInfoWrapper = new EntityWrapper<>();
-        warehouseInOutInfoWrapper.eq("status_flag", "3").eq("delete_flag", "0").eq("return_tick_flag", "0");
-        if (!StringUtils.isEmpty(warehousingOrder.getContractNo())) {
-            warehouseInOutInfoWrapper.eq("contract_no", warehousingOrder.getContractNo());
+        warehouseInOutInfoWrapper.eq("status_flag", "3").eq("delete_flag", "0").ne("return_tick_flag", "2");
+        if (!StringUtils.isEmpty(warehouseInOutInfo.getContractNo())) {
+            warehouseInOutInfoWrapper.eq("contract_no", warehouseInOutInfo.getContractNo());
         }
-        if (!StringUtils.isEmpty(warehousingOrder.getMoveTaskNo())) {
-            warehouseInOutInfoWrapper.eq("in_out_task_no", warehousingOrder.getMoveTaskNo());
+        if (!StringUtils.isEmpty(warehouseInOutInfo.getMoveTaskNo())) {
+            warehouseInOutInfoWrapper.eq("in_out_task_no", warehouseInOutInfo.getMoveTaskNo());
+            warehouseInOutInfoWrapper.eq("in_out_type", "移库出库");
         }
-        List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(warehouseInOutInfoWrapper);
+        Page<WarehouseInOutInfo> warehouseInOutInfoPage = warehouseInOutInfoService.selectPage(warehouseInOutInfo.getQueryPage(), warehouseInOutInfoWrapper);
+        List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoPage.getRecords();
         if (!CollectionUtils.isEmpty(warehouseInOutInfoList)){
-            for (WarehouseInOutInfo warehouseInOutInfo:warehouseInOutInfoList){
+            for (WarehouseInOutInfo warehouseInOutInfo1:warehouseInOutInfoList){
                 SourceRelationInfo sourceRelationInfo=new SourceRelationInfo();
-                sourceRelationInfo.setCarNo(warehouseInOutInfo.getCarNo());
-                sourceRelationInfo.setEstimateOutWarehouseWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
-                sourceRelationInfo.setIssuingTime(warehouseInOutInfo.getInOutDate());
-                sourceRelationInfo.setWarehouseName(warehouseInOutInfo.getWarehouseName());
-                sourceRelationInfo.setReturnTickFlag(warehouseInOutInfo.getReturnTickFlag());
+                sourceRelationInfo.setCarNo(warehouseInOutInfo1.getCarNo());
+                sourceRelationInfo.setEstimateOutWarehouseWeight(Float.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())));
+                sourceRelationInfo.setIssuingTime(warehouseInOutInfo1.getInOutDate());
+                sourceRelationInfo.setWarehouseName(warehouseInOutInfo1.getWarehouseName());
+                sourceRelationInfo.setReturnTickFlag(warehouseInOutInfo1.getReturnTickFlag());
                 String goodsSource="";
                 InOutWarehouseTask inOutWarehouseTask=inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
-                .eq("in_out_task_no",warehouseInOutInfo.getInOutTaskNo())
-                .eq("comp_id",warehousingOrder.getCompId()));
+                .eq("in_out_task_no",warehouseInOutInfo1.getInOutTaskNo()));
                 if (inOutWarehouseTask!=null) {
                     List<SourceRelationInfo> sourceRelationInfoList1 = sourceRelationInfoService.selectList(new EntityWrapper<SourceRelationInfo>()
                             .eq("task_id", inOutWarehouseTask.getId())
                             .eq("delete_flag", "0"));
                     if (!CollectionUtils.isEmpty(sourceRelationInfoList1)){
+                        for (SourceRelationInfo sourceRelationInfo1:sourceRelationInfoList1){
+                            sourceRelationInfo1.setSurplusWeight(Float.valueOf(String.valueOf(sourceRelationInfo1.getProportion()*warehouseInOutInfo1.getNetWeight())));
+                        }
                         sourceRelationInfo.setSourceRelationInfoList(sourceRelationInfoList1);
                     }
                 }
+                sourceRelationInfo.setReturnTickFlag(warehouseInOutInfo1.getReturnTickFlag());
                 sourceRelationInfo.setGoodsSource(goodsSource);
-                sourceRelationInfo.setWarehouseInOutId(warehouseInOutInfo.getId());
+                sourceRelationInfo.setWarehouseInOutId(warehouseInOutInfo1.getId());
                 sourceRelationInfoList.add(sourceRelationInfo);
             }
         }
-        return sourceRelationInfoList;
+        sourceRelationInfoPage.setRecords(sourceRelationInfoList);
+        sourceRelationInfoPage.setTotal(warehouseInOutInfoPage.getTotal());
+        return sourceRelationInfoPage;
     }
 
 
@@ -154,6 +162,10 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
         Map<String, Object> pageView = new HashMap<>();
         pageView.put("startRecord", (warehousingOrder.getCurrentPage() - 1)
                 * warehousingOrder.getPageSize());
+        List<String> businessKeys = null;
+        if ("2".equals(warehousingOrder.getSearchType())) {
+            businessKeys = workflowService.getTaskBusinessKeysByCode("WAREHOUSING-ORDER-APPROVE");
+        }
         pageView.put("searchKeyWord", warehousingOrder.getSearchKeyWord());
         pageView.put("searchType", warehousingOrder.getSearchType());
         pageView.put("pageSize", warehousingOrder.getPageSize());
@@ -161,6 +173,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
         pageView.put("startDate", warehousingOrder.getStartDate());
         pageView.put("endDate", warehousingOrder.getEndDate());
         pageView.put("baseId", warehousingOrder.getBaseId());
+        pageView.put("businessKeys", businessKeys);
         pageView.put("flag", warehousingOrder.getFlag());
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         // 查询总数
@@ -221,17 +234,17 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
      * 每天16.30点更新
      */
     @Transactional
-    @Scheduled(cron = "0 31 09 * * ?")
+    @Scheduled(cron = "0 11 10 * * ?")
     public String addInfo() {
-        WarehousingOrder warehousingOrder = new WarehousingOrder();
         //当天零点
-        SimpleDateFormat now = new SimpleDateFormat("yyyy-MM-dd 09:31:00");
+        SimpleDateFormat now = new SimpleDateFormat("yyyy-MM-dd 10:11:00");
         Calendar c = Calendar.getInstance();
         c.setTime(new Date());
         c.add(Calendar.DATE, -1);
         String beforeDay=now.format(c.getTime());
         Map<String, Object> pageView = new HashMap<>();
         pageView.put("beforeDay", beforeDay);
+
         //收购
         List<WarehousingOrder> dataList = baseMapper.getAcquisitionListByCondition(pageView);
         if (!CollectionUtils.isEmpty(dataList)){
@@ -242,6 +255,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                         .eq("goods_name",warehousingOrder1.getGoodsName())
                         .ne("status", "待结算")
                         .ge("update_date", beforeDay));
+                WarehousingOrder warehousingOrder = new WarehousingOrder();
                 warehousingOrder.setId(IdGenerator.generateUUID());
                 warehousingOrder.setBaseId(warehousingOrder1.getBaseId());
                 warehousingOrder.setIdentifyId(warehousingOrder1.getIdentifyId());
@@ -271,6 +285,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                         .eq("warehouse_name",warehousingOrder1.getWarehouseName())
                         .eq("in_out_type", "采购入库")
                         .ge("update_date", beforeDay));
+                WarehousingOrder warehousingOrder = new WarehousingOrder();
                 warehousingOrder.setId(IdGenerator.generateUUID());
                 warehousingOrder.setBaseId(warehousingOrder1.getBaseId());
                 warehousingOrder.setWarehouseName(warehousingOrder1.getWarehouseName());
@@ -372,6 +387,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 .ge("update_date", beforeDay));
         if (!CollectionUtils.isEmpty(warehouseInOutInfoList1)) {
             for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList1) {
+                WarehousingOrder warehousingOrder = new WarehousingOrder();
                 warehousingOrder.setId(IdGenerator.generateUUID());
                 warehousingOrder.setBaseId(warehouseInOutInfo.getBaseId());
                 InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
@@ -384,8 +400,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 warehousingOrder.setCompId(inOutWarehouseTask.getCompId());
                 warehousingOrder.setCarNo(warehouseInOutInfo.getCarNo());
                 warehousingOrder.setIssuingTime(new Date());
-                warehousingOrder.setInType(warehouseInOutInfo.getInOutType());
-                warehousingOrder.setDeliveryWarehouse(warehouseInOutInfo.getCarNo());
+                warehousingOrder.setDeliveryWarehouse(inOutWarehouseTask.getSendWarehouse());
                 warehousingOrder.setGoodsName(warehouseInOutInfo.getGoodsName());
                 warehousingOrder.setAvgCost(Double.valueOf(String.valueOf(warehouseInOutInfo.getCost())));
                 warehousingOrder.setInType("移库入库");
@@ -403,6 +418,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 .ge("update_date", beforeDay));
         if (!CollectionUtils.isEmpty(warehouseInOutInfoList2)) {
             for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList2) {
+                WarehousingOrder warehousingOrder = new WarehousingOrder();
                 warehousingOrder.setId(IdGenerator.generateUUID());
                 warehousingOrder.setBaseId(warehouseInOutInfo.getBaseId());
                 InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
@@ -415,9 +431,8 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 warehousingOrder.setGoodsSource(inOutWarehouseTask.getAgent()+"(退)");
                 warehousingOrder.setCompId(inOutWarehouseTask.getCompId());
                 warehousingOrder.setCarNo(warehouseInOutInfo.getCarNo());
-                warehousingOrder.setInType(warehouseInOutInfo.getInOutType());
                 warehousingOrder.setIssuingTime(new Date());
-                warehousingOrder.setDeliveryWarehouse(inOutWarehouseTask.getSendWarehouse());
+                warehousingOrder.setDeliveryWarehouse(warehouseInOutInfo.getCarNo());
                 warehousingOrder.setGoodsName(warehouseInOutInfo.getGoodsName());
                 warehousingOrder.setAvgCost(Double.valueOf(String.valueOf(warehouseInOutInfo.getCost())));
                 warehousingOrder.setInType("退库");
@@ -427,6 +442,20 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 this.insert(warehousingOrder);
             }
         }
+        //当天零点
+        SimpleDateFormat now1 = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
+        Calendar a = Calendar.getInstance();
+        a.setTime(new Date());
+        a.add(Calendar.DATE, 0);
+        String time=now1.format(c.getTime());
+        //查询当天生成的数据
+        List<WarehousingOrder> list = this.selectList(new EntityWrapper<WarehousingOrder>()
+        .ge("create_date",time));
+//
+//        String goodsName = warehousingOrder1.getGoodsName();
+//        if(goodsName.contains("玉米")&&!goodsName.contains("潮粮")){
+//            goodsName = "玉米";
+//        }
         return "OK";
 
     }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -796,7 +796,7 @@
         AND qim.delete_flag = 0
         LEFT JOIN payment_management pm ON pm.relation_id = qim.relation_id
         AND pm.delete_flag = 0
-        LEFT JOIN warehousing_order war ON war.base_id = w.id  AND war.in_type = '收购入库'
+        LEFT JOIN warehousing_order war ON war.base_id = wbi.id  AND war.in_type = '收购入库'
         AND war.comp_id = wbi.comp_id
         AND war.delete_flag = '0'
         LEFT JOIN source_relation_info sri ON sri.source_id = war.id

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehousingOrderMapper.xml

@@ -40,6 +40,13 @@
         <if test="baseId != null and baseId != ''">
             AND base_id= #{baseId}
         </if>
+        <if test="businessKeys != null and businessKeys.size > 0">
+            and(
+            <foreach collection="businessKeys" item="businessValue" open="(" close=")" separator="or">
+                a.id = #{businessValue}
+            </foreach>
+            )
+        </if>
         group BY base_id,DATE_FORMAT(issuing_time,"%Y%m%d") )tt
     </select>
     <!-- 入库单列表查询 -->
@@ -85,6 +92,13 @@
         <if test="baseId != null and baseId != ''">
             AND w.base_id= #{baseId}
         </if>
+        <if test="businessKeys != null and businessKeys.size > 0">
+            and(
+            <foreach collection="businessKeys" item="businessValue" open="(" close=")" separator="or">
+                a.id = #{businessValue}
+            </foreach>
+            )
+        </if>
         group BY w.base_id,DATE_FORMAT(w.issuing_time,"%Y%m%d")
         ORDER BY w.update_date DESC
         <if test="currentPage != null and currentPage != ''">