Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QuerySaleOrderListReqVO.java

@@ -4,6 +4,7 @@ import com.chanjet.openapi.sdk.java.AbstractChanjetContent;
 import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto.ParamDicDTO;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.util.*;
 
 /**
@@ -25,6 +26,10 @@ public class QuerySaleOrderListReqVO extends AbstractChanjetContent {
         put("SaleOrder.VoucherState.Code", new ArrayList<ParamDicDTO>(){{
             add(new ParamDicDTO("01"));
         }});
+        put("SaleOrder.VoucherDate", new ArrayList<ParamDicDTO>(){{
+            add(new ParamDicDTO(LocalDate.now().minusDays(15).toString()));
+            add(new ParamDicDTO(LocalDate.now().toString()));
+        }});
     }};
 
     public QuerySaleOrderListReqVO(int pageIndex) {

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storage/StorageServiceImpl.java

@@ -372,10 +372,12 @@ public class StorageServiceImpl implements StorageService {
                     tplusStorageOutDO.setStockCreateDate(storageDO.getOutboundTime());
                     tplusStorageOutDO.setWhId(storageDO.getWhId());
                     tplusStorageOutDO.setWhNo(warehouseMapper.selectById(storageDO.getWhId()).getWhNo());
+                    tplusStorageOutDO.setWhNo(warehouseMapper.selectById(storageDO.getWhId()).getWhName());
                     tplusStorageOutDO.setProjectSubCode(sm.getProjectSubCode());
                     tplusStorageOutDO.setProjectSubName(materialMapper.selectOne(MaterialDO::getCode,sm.getProjectSubCode()).getName());
                     tplusStorageOutDO.setMatId(materialMapper.selectOne(MaterialDO::getCode,sm.getProjectSubCode()).getId());
                     tplusStorageOutDO.setStorageOkQty(sm.getStorageOkQty().multiply(new BigDecimal(-1)));
+                    tplusStorageOutDO.setIsSend(0);
                     sameWhAndMats.add(tplusStorageOutDO);
                 }
             });
@@ -391,10 +393,12 @@ public class StorageServiceImpl implements StorageService {
                 tplusStorageOutDO.setStockCreateDate(storageDO.getOutboundTime());
                 tplusStorageOutDO.setWhId(storageDO.getWhId());
                 tplusStorageOutDO.setWhNo(warehouseMapper.selectById(storageDO.getWhId()).getWhNo());
+                tplusStorageOutDO.setWhNo(warehouseMapper.selectById(storageDO.getWhId()).getWhName());
                 tplusStorageOutDO.setProjectSubCode(sm.getProjectSubCode());
                 tplusStorageOutDO.setProjectSubName(materialMapper.selectOne(MaterialDO::getCode,sm.getProjectSubCode()).getName());
                 tplusStorageOutDO.setMatId(materialMapper.selectOne(MaterialDO::getCode,sm.getProjectSubCode()).getId());
                 tplusStorageOutDO.setStorageOkQty(sm.getStorageOkQty().multiply(new BigDecimal(-1)));
+                tplusStorageOutDO.setIsSend(0);
                 insertWhAndMats.add(tplusStorageOutDO);
             });
             tplusStorageOutMapper.delete(TplusStorageOutDO::getStockId,storageDO.getId());

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java

@@ -101,8 +101,8 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
     @Transactional(rollbackFor = Exception.class)
     public void removeTaskDispatch(List<Integer> ids){
         ids.forEach(id->{
-            taskDispatchDetailMapper.delete(TaskDispatchDetailDO::getDispatchId,id);
-            taskReportMapper.delete(TaskReportDO::getDispatchId,id);
+            taskDispatchDetailMapper.delete(TaskDispatchDetailDO::getDetailOwnerId,id);
+            taskReportMapper.delete(TaskReportDO::getDispatchDetailId,id);
         });
     }