【需求】单据日期沿用销售订单

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

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Objects;
 
 /**
@@ -34,4 +35,7 @@ public class QuerySaleOrderListResDTO {
     @Schema(description = "仓库id")
     private Long warehouseId;
 
+    @Schema(description = "单据日期")
+    private LocalDateTime orderTime;
+
 }

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

@@ -1,11 +1,13 @@
 package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo;
 
 import com.chanjet.openapi.sdk.java.AbstractChanjetContent;
-import lombok.AllArgsConstructor;
+import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto.ParamDicDTO;
 import lombok.Data;
-import org.apache.commons.collections4.map.HashedMap;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 查询销售订单列表
@@ -20,12 +22,9 @@ public class QuerySaleOrderListReqVO extends AbstractChanjetContent {
     private int pageIndex = 0;
     // "SaleOrder.Department.Name", 提出部门
     //"SaleOrder.Clerk.Name" 业务员
-    private List<String> selectFields = Arrays.asList("SaleOrder.ID", "SaleOrder.Code","SaleOrder.Customer.ID","SaleOrder.SaleOrderDetails.Inventory.ID","SaleOrder.SaleOrderDetails.Unit.Code","SaleOrder.SaleOrderDetails.Quantity","SaleOrder.SaleOrderDetails.Warehouse.ID");
+    private List<String> selectFields = Arrays.asList("SaleOrder.ID", "SaleOrder.Code","SaleOrder.Customer.ID","SaleOrder.SaleOrderDetails.Inventory.ID","SaleOrder.SaleOrderDetails.Unit.Code","SaleOrder.SaleOrderDetails.Quantity","SaleOrder.SaleOrderDetails.Warehouse.ID","SaleOrder.VoucherDate");
     private Map<String, Object> paramDic = new HashMap<String, Object>(2){{
-        put("SaleOrder.Voucherstate.Code", new HashMap<String,String>(2){{
+        put("SaleOrder.Voucherstate.Code", new ParamDicDTO("01"));
-            put("text", "01");
-            put("value", "01");
-        }});
     }};
 
     public QuerySaleOrderListReqVO(int pageIndex) {

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java

@@ -57,6 +57,7 @@ import org.springframework.util.StringUtils;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -710,7 +711,7 @@ public class ChanjetManager {
 
             ListResultDataDTO resultData = result.getData();
             if(resultData != null && CollUtil.isNotEmpty(resultData.getRows())){
-
+                DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy/MM/dd");
                 // 转化对象
                 List<List<String>> dataLists = resultData.getRows();
                 dataLists.forEach(values -> {
@@ -722,6 +723,7 @@ public class ChanjetManager {
                     resDTO.setUnit(values.get(4));
                     resDTO.setAmount(new BigDecimal(values.get(5)).intValue());
                     resDTO.setWarehouseId(StringUtils.isEmpty(values.get(6)) ?  null : ChanjetSpi.getIdPrefix()+Long.parseLong(values.get(6)));
+                    resDTO.setOrderTime(LocalDateTime.parse(values.get(7), df));
                     resulDataList.add(resDTO);
                 });
                 hasMore = dataLists.size() == paramVO.getPageSize();

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/projectorder/ProjectOrderServiceImpl.java

@@ -12,7 +12,6 @@ import com.chanko.yunxi.mes.module.biz.dal.dataobject.customer.CustomerDO;
 import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderDO;
 import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderSubDO;
 import com.chanko.yunxi.mes.module.biz.dal.dataobject.serialnumber.SerialNumberDO;
-import com.chanko.yunxi.mes.module.biz.dal.mysql.deliverorder.DeliverOrderSubMapper;
 import com.chanko.yunxi.mes.module.biz.dal.mysql.projectorder.ProjectOrderMapper;
 import com.chanko.yunxi.mes.module.biz.dal.mysql.projectorder.ProjectOrderSubMapper;
 import com.chanko.yunxi.mes.module.biz.enums.BusinessTypeEnum;
@@ -67,9 +66,6 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
     @Resource
     private FileService fileService;
 
-    @Resource
-    private DeliverOrderSubMapper deliverOrderSubMapper;
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createProjectOrder(ProjectOrderSaveReqVO createReqVO) {