试样订单:新增产品试样确认单

房远帅
1 parent 09fa860f
Showing 3 changed files with 77 additions and 4 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/handlers/BusinessDataHandlerServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sample/confirm/QueryProductSampleConfirmationSlipVo.java
xingyun-sc/src/main/resources/mappers/sample/ProductSampleConfirmationSlipMapper.xml
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/handlers/BusinessDataHandlerServiceImpl.java
View file @0f0aa67
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/handlers/BusinessDataHandlerServiceImpl.java
View file @0f0aa67
@@ -11,12 +11,16 @@ import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
+import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
+import com.lframework.xingyun.sc.service.contract.ContractStdProcessingLineService;
 import com.lframework.xingyun.sc.service.contract.SpecLockDelayApplicationService;
 import com.lframework.xingyun.sc.service.customer.CorePersonnelHistoryService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditHistoryService;
@@ -26,6 +30,7 @@ import com.lframework.xingyun.sc.service.ledger.FundCoordinationService;
 import com.lframework.xingyun.sc.service.ledger.ReceiptLedgerInfoService;
 import com.lframework.xingyun.sc.service.order.*;
 import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderService;
+import com.lframework.xingyun.sc.service.sample.ProductSampleConfirmationSlipService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.car.CarRequestPlanService;
@@ -39,6 +44,8 @@ import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderRevokeLineVo;
+import com.lframework.xingyun.sc.vo.sample.confirm.CreateProductSampleConfirmationSlipDetailVo;
+import com.lframework.xingyun.sc.vo.sample.confirm.CreateProductSampleConfirmationSlipVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateCarRequestPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
@@ -58,9 +65,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 @Component
@@ -122,6 +127,14 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private ShipmentsOrderInfoService shipmentsOrderInfoService;
     @Resource
     private ReceiptLedgerInfoService receiptLedgerInfoService;
+    @Resource
+    private ContractDistributorLineService contractDistributorLineService;
+    @Resource
+    private ContractStdProcessingLineService contractStdProcessingLineService;
+    @Resource
+    private SysDataDicItemService sysDataDicItemService;
+    @Resource
+    private ProductSampleConfirmationSlipService productSampleConfirmationSlipService;
@@ -757,6 +770,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                 createPurchaseOrderLineVo.setAssessmentExceedsAgreement(purchaseOrderLine.getAssessmentExceedsAgreement());
                 createPurchaseOrderLineVo.setPackagingFee(purchaseOrderLine.getPackagingFee());
                 createPurchaseOrderLineVo.setSampleOrder(purchaseOrderLine.isSampleOrder());
+                createPurchaseOrderLineVo.setContractDistributorLineId(purchaseOrderLine.getContractDistributorLineId());
                 list.add(createPurchaseOrderLineVo);
                 totalQuantity = totalQuantity.add(purchaseOrderLine.getQuantity());
@@ -766,7 +780,57 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             vo.setTotalQuantity(totalQuantity);
             vo.setCreatePurchaseOrderLineVoList(list);
-            purchaseOrderInfoService.create(vo);
+            String id = purchaseOrderInfoService.create(vo);
+
+            //新增产品试样确认单
+            CreateProductSampleConfirmationSlipVo vo2 = new CreateProductSampleConfirmationSlipVo();
+            vo2.setOrderId(id);
+            vo2.setRegion(vo.getRegion());
+            vo2.setOrderingUnit(vo.getOrderingUnit());
+            vo2.setWorkshopId(vo.getWorkshopId());
+            vo2.setTotalQuantity(vo.getTotalQuantity());
+            QueryPurchaseOrderLineVo vo3 = new QueryPurchaseOrderLineVo();
+            vo3.setPurchaseOrderId(id);
+            List<PurchaseOrderLine> lines = purchaseOrderLineService.query(vo3);
+            List<CreateProductSampleConfirmationSlipDetailVo> detailVoList = new ArrayList<>();
+            Set<String> set = new HashSet<>();
+            for (PurchaseOrderLine line : lines) {
+                CreateProductSampleConfirmationSlipDetailVo detailVo = new CreateProductSampleConfirmationSlipDetailVo();
+                detailVo.setPurchaseOrderLineId(line.getId());
+                detailVo.setBrand(line.getBrand());
+                detailVo.setThickness(line.getThickness());
+                detailVo.setThicknessTolPos(line.getThicknessTolPos());
+                detailVo.setThicknessTolNeg(line.getThicknessTolNeg());
+                detailVo.setWidth(line.getWidth());
+                detailVo.setWidthTolPos(line.getWidthTolPos());
+                detailVo.setWidthTolNeg(line.getWidthTolNeg());
+                detailVo.setLength(line.getLength());
+                detailVo.setLengthTolPos(line.getLengthTolPos());
+                detailVo.setLengthTolNeg(line.getLengthTolNeg());
+                detailVo.setStatus(line.getStatus());
+                detailVo.setQuantity(line.getQuantity());
+                detailVoList.add(detailVo);
+                String contractDistributorLineId = line.getContractDistributorLineId();
+                ContractDistributorLine contractDistributorLine = contractDistributorLineService.findById(contractDistributorLineId);
+                if (contractDistributorLine != null) {
+                    String productId = contractDistributorLine.getProductId();
+                    set.add(productId);
+                } else {
+                    ContractStdProcessingLine stdProcessingLine = contractStdProcessingLineService.findById(contractDistributorLineId);
+                    if (stdProcessingLine != null) {
+                        set.add(stdProcessingLine.getProductId());
+                    }
+                }
+            }
+            String names = set.stream()
+                    .map(key -> sysDataDicItemService.findByCode("CONTRACT_PRODUCT", key))
+                    .filter(Objects::nonNull) // 防止 findByCode 返回 null 导致 NPE
+                    .map(SysDataDicItem::getName)
+                    .filter(Objects::nonNull) // 可选：过滤掉 name 为 null 的情况
+                    .collect(Collectors.joining("，")); // 中文逗号
+            vo2.setBelongingBreed(names);
+            vo2.setProductSampleConfirmationSlipDetailList(detailVoList);
+            productSampleConfirmationSlipService.create(vo2);
             //更新原来订货单总数量
             if (purchaseOrderInfo.getTotalQuantity() != null) {
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sample/confirm/QueryProductSampleConfirmationSlipVo.java
View file @0f0aa67
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sample/confirm/QueryProductSampleConfirmationSlipVo.java
View file @0f0aa67
@@ -35,4 +35,10 @@ public class QueryProductSampleConfirmationSlipVo extends PageVo implements Base
     @ApiModelProperty("所属厂别")
     private String workshopId;
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
 }
--- a/xingyun-sc/src/main/resources/mappers/sample/ProductSampleConfirmationSlipMapper.xml
View file @0f0aa67
+++ b/xingyun-sc/src/main/resources/mappers/sample/ProductSampleConfirmationSlipMapper.xml
View file @0f0aa67
@@ -127,6 +127,9 @@
             <if test="vo.workshopId != null and vo.workshopId != ''">
                 AND tb.workshop_id = #{vo.workshopId}
             </if>
+            <if test="vo.status != null and vo.status != ''">
+                AND tb.status = #{vo.status}
+            </if>
         </where>
         ORDER BY tb.create_time DESC
     </select>