试样订单:跟踪单-bug修复

@@ -1231,17 +1231,17 @@ create table if not exists sample_feedback_tracking_detail(
 
 
 --合同物料行新增字段
 --合同物料行新增字段
 ALTER TABLE tbl_contract_std_processing_line
 ALTER TABLE tbl_contract_std_processing_line
-    ADD COLUMN sample_order boolean DEFAULT FALSE COMMENT '是否为试样订单';
+    ADD COLUMN sample_order Boolean DEFAULT FALSE COMMENT '是否为试样订单';
 
 
 ALTER TABLE tbl_contract_distributor_line
 ALTER TABLE tbl_contract_distributor_line
-    ADD COLUMN sample_order boolean DEFAULT FALSE COMMENT '是否为试样订单';
+    ADD COLUMN sample_order Boolean DEFAULT FALSE COMMENT '是否为试样订单';
 
 
 --订货单、订货单物料行新增字段
 --订货单、订货单物料行新增字段
 ALTER TABLE purchase_order_info
 ALTER TABLE purchase_order_info
-    ADD COLUMN sample_order boolean DEFAULT FALSE COMMENT '是否为试样订单';
+    ADD COLUMN sample_order Boolean DEFAULT FALSE COMMENT '是否为试样订单';
 
 
 ALTER TABLE tbl_purchase_order_line
 ALTER TABLE tbl_purchase_order_line
-    ADD COLUMN sample_order boolean DEFAULT FALSE COMMENT '是否为试样订单';
+    ADD COLUMN sample_order Boolean DEFAULT FALSE COMMENT '是否为试样订单';
 
 
 alter table tbl_purchase_order_line add column contract_distributor_line_id varchar(32) DEFAULT NULL comment '合同物料行ID';
 alter table tbl_purchase_order_line add column contract_distributor_line_id varchar(32) DEFAULT NULL comment '合同物料行ID';
 
 

@@ -288,7 +288,7 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     /**
     /**
      * 是否为试样订单
      * 是否为试样订单
      */
      */
-    private boolean sampleOrder;
+    private Boolean sampleOrder;
 
 
     /**
     /**
      * 下单人(非持久化字段)
      * 下单人(非持久化字段)

@@ -272,7 +272,7 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     /**
     /**
      * 是否为试样订单
      * 是否为试样订单
      */
      */
-    private boolean sampleOrder;
+    private Boolean sampleOrder;
 
 
     /**
     /**
      * 新增/删除/变更
      * 新增/删除/变更

@@ -715,7 +715,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
         List<PurchaseOrderLine> lineVoList = purchaseOrderLineService.query(vo1);
         List<PurchaseOrderLine> lineVoList = purchaseOrderLineService.query(vo1);
         if (CollectionUtils.isNotEmpty(lineVoList)) {
         if (CollectionUtils.isNotEmpty(lineVoList)) {
             Map<Boolean, List<PurchaseOrderLine>> partitioned = lineVoList.stream()
             Map<Boolean, List<PurchaseOrderLine>> partitioned = lineVoList.stream()
-                    .collect(Collectors.partitioningBy(PurchaseOrderLine::isSampleOrder));
+                    .collect(Collectors.partitioningBy(PurchaseOrderLine::getSampleOrder));
 
 
             List<PurchaseOrderLine> sampleOrders = partitioned.get(true);   // 是试样订单
             List<PurchaseOrderLine> sampleOrders = partitioned.get(true);   // 是试样订单
             if (CollectionUtils.isEmpty(sampleOrders)) {
             if (CollectionUtils.isEmpty(sampleOrders)) {
@@ -778,7 +778,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                 createPurchaseOrderLineVo.setShowOrder(purchaseOrderLine.getShowOrder());
                 createPurchaseOrderLineVo.setShowOrder(purchaseOrderLine.getShowOrder());
                 createPurchaseOrderLineVo.setAssessmentExceedsAgreement(purchaseOrderLine.getAssessmentExceedsAgreement());
                 createPurchaseOrderLineVo.setAssessmentExceedsAgreement(purchaseOrderLine.getAssessmentExceedsAgreement());
                 createPurchaseOrderLineVo.setPackagingFee(purchaseOrderLine.getPackagingFee());
                 createPurchaseOrderLineVo.setPackagingFee(purchaseOrderLine.getPackagingFee());
-                createPurchaseOrderLineVo.setSampleOrder(purchaseOrderLine.isSampleOrder());
+                createPurchaseOrderLineVo.setSampleOrder(purchaseOrderLine.getSampleOrder());
                 createPurchaseOrderLineVo.setContractDistributorLineId(purchaseOrderLine.getContractDistributorLineId());
                 createPurchaseOrderLineVo.setContractDistributorLineId(purchaseOrderLine.getContractDistributorLineId());
                 list.add(createPurchaseOrderLineVo);
                 list.add(createPurchaseOrderLineVo);
 
 

@@ -172,7 +172,7 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 .set(PurchaseOrderLine::getShowOrder, vo.getShowOrder() == null ? null : vo.getShowOrder())
                 .set(PurchaseOrderLine::getShowOrder, vo.getShowOrder() == null ? null : vo.getShowOrder())
                 .set(PurchaseOrderLine::getAssessmentExceedsAgreement, StringUtil.isBlank(vo.getAssessmentExceedsAgreement()) ? null : vo.getAssessmentExceedsAgreement())
                 .set(PurchaseOrderLine::getAssessmentExceedsAgreement, StringUtil.isBlank(vo.getAssessmentExceedsAgreement()) ? null : vo.getAssessmentExceedsAgreement())
                 .set(PurchaseOrderLine::getPackagingFee, vo.getPackagingFee() == null ? null : vo.getPackagingFee())
                 .set(PurchaseOrderLine::getPackagingFee, vo.getPackagingFee() == null ? null : vo.getPackagingFee())
-                .set(PurchaseOrderLine::isSampleOrder, vo.isSampleOrder())
+                .set(PurchaseOrderLine::getSampleOrder, vo.isSampleOrder())
                 .eq(PurchaseOrderLine::getId, vo.getId());
                 .eq(PurchaseOrderLine::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);

@@ -102,7 +102,7 @@ public class SampleResultTrackingServiceImpl extends BaseMpServiceImpl<SampleRes
         if (CollectionUtil.isNotEmpty(vo.getSampleFeedbackTrackingDetailList())) {
         if (CollectionUtil.isNotEmpty(vo.getSampleFeedbackTrackingDetailList())) {
             List<SampleFeedbackTrackingDetail> detailList = vo.getSampleFeedbackTrackingDetailList();
             List<SampleFeedbackTrackingDetail> detailList = vo.getSampleFeedbackTrackingDetailList();
             detailList.forEach(detail -> detail.setTrackingId(data.getId()));
             detailList.forEach(detail -> detail.setTrackingId(data.getId()));
-            sampleFeedbackTrackingDetailMapper.batchAdd(vo.getSampleFeedbackTrackingDetailList());
+            sampleFeedbackTrackingDetailMapper.batchAdd(detailList);
         }
         }
 
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());

@@ -465,7 +465,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             for (String orderId : orderIds) {
             for (String orderId : orderIds) {
                 CreateSampleResultTrackingVo vo1 = new CreateSampleResultTrackingVo();
                 CreateSampleResultTrackingVo vo1 = new CreateSampleResultTrackingVo();
                 PurchaseOrderInfo info = purchaseOrderInfoService.findById(orderId);
                 PurchaseOrderInfo info = purchaseOrderInfoService.findById(orderId);
-                if (!info.isSampleOrder()) {
+                if (!info.getSampleOrder()) {
                     continue;
                     continue;
                 }
                 }
                 vo1.setDeptId(info.getDeptId());
                 vo1.setDeptId(info.getDeptId());
@@ -481,9 +481,9 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                     vo2.setIds(ids);
                     vo2.setIds(ids);
                     List<ShipmentsPlanDetail> query = shipmentsPlanDetailService.query(vo2);
                     List<ShipmentsPlanDetail> query = shipmentsPlanDetailService.query(vo2);
                     if (CollectionUtils.isNotEmpty(query)) {
                     if (CollectionUtils.isNotEmpty(query)) {
-                        SampleFeedbackTrackingDetail detail = new SampleFeedbackTrackingDetail();
                         String userId = SecurityUtil.getCurrentUser().getId();
                         String userId = SecurityUtil.getCurrentUser().getId();
                         for (ShipmentsPlanDetail shipmentsPlanDetail : query) {
                         for (ShipmentsPlanDetail shipmentsPlanDetail : query) {
+                            SampleFeedbackTrackingDetail detail = new SampleFeedbackTrackingDetail();
                             detail.setId(IdUtil.getId());
                             detail.setId(IdUtil.getId());
                             detail.setOrderId(orderId);
                             detail.setOrderId(orderId);
                             detail.setOrderSpecId(shipmentsPlanDetail.getOrderSpecId());
                             detail.setOrderSpecId(shipmentsPlanDetail.getOrderSpecId());