Merge branch 'master_after0506' into master_after0506_report02_1

房远帅
2 parents 170d136f 828c45ec
Showing 5 changed files with 53 additions and 6 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/handlers/BusinessDataExportHandler.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractDistributorStandardServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/statistics/ShipmentQuantityIndustryStatisticsServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/statistics/ShipmentQuantityStatisticsServiceImpl.java
xingyun-sc/src/main/resources/mappers/statistics/ShipmentQuantityIndustryStatisticsMapper.xml
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/handlers/BusinessDataExportHandler.java
View file @74f29d2
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/handlers/BusinessDataExportHandler.java
View file @74f29d2
@@ -290,7 +290,7 @@ public class BusinessDataExportHandler implements ExportHandler {
                         File pdfFile = ExcelUtil.convertExcelToPdf(tempExcel, "/usr/bin/libreoffice --headless --convert-to pdf --outdir %s %s");
                         try (InputStream pdfIn = new FileInputStream(pdfFile)) {
                             ZipEntry entry = new ZipEntry(orderInfo.getOrderNo() + "-"
-                                    + orderInfo.getOrderingUnitName() + "-" + orderInfo.getWorkshopName() + "-订货单打印" + ".pdf");
+                                    + orderInfo.getOrderingUnitName() + "-" + orderInfo.getWorkshopName() + "-订货单打印-" + createTime + ".pdf");
                             zos.putNextEntry(entry);
                             byte[] buffer = new byte[8192];
                             int len;
@@ -310,7 +310,7 @@ public class BusinessDataExportHandler implements ExportHandler {
                         ByteArrayOutputStream baos = new ByteArrayOutputStream();
                         workbook.write(baos);
                         ZipEntry entry = new ZipEntry(orderInfo.getOrderNo() + "-"
-                                + orderInfo.getOrderingUnitName() + "-" + orderInfo.getWorkshopName() + "-订货单打印" + ".xlsx");
+                                + orderInfo.getOrderingUnitName() + "-" + orderInfo.getWorkshopName() + "-订货单打印-" + createTime + ".xlsx");
                         zos.putNextEntry(entry);
                         zos.write(baos.toByteArray());
                         zos.closeEntry();
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractDistributorStandardServiceImpl.java
View file @74f29d2
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractDistributorStandardServiceImpl.java
View file @74f29d2
@@ -215,8 +215,7 @@ public class ContractDistributorStandardServiceImpl extends
     public List<ContractDistributorStandard> query(QueryContractDistributorStandardVo vo) {
         List<ContractDistributorStandard> datas = getBaseMapper().query(vo);
-        CollectionUtils.emptyIfNull(datas).forEach(data -> data.setCanSplit(isCanSplitByCode(data.getCode())
-                && !Boolean.TRUE.equals(data.getPriceSpecLocked())));
+        CollectionUtils.emptyIfNull(datas).forEach(data -> data.setCanSplit(isCanSplit(data)));
         return datas;
     }
@@ -227,7 +226,7 @@ public class ContractDistributorStandardServiceImpl extends
         if (data == null) {
             return null;
         }
-        data.setCanSplit(isCanSplitByCode(data.getCode()) && !Boolean.TRUE.equals(data.getPriceSpecLocked()));
+        data.setCanSplit(isCanSplit(data));
         Wrapper<PurchaseOrderInfo> orderInfoWrapper = Wrappers.lambdaQuery(PurchaseOrderInfo.class)
                 .eq(PurchaseOrderInfo::getContractId, data.getId());
         List<PurchaseOrderInfo> purchaseOrderInfoList = purchaseOrderInfoService.list(orderInfoWrapper);
@@ -293,6 +292,19 @@ public class ContractDistributorStandardServiceImpl extends
         return !code.matches(".*_\\d{2}$");
     }
+    private boolean isCanSplit(ContractDistributorStandard data) {
+        if (data == null) {
+            return false;
+        }
+        if (!isCanSplitByCode(data.getCode()) || Boolean.TRUE.equals(data.getPriceSpecLocked())) {
+            return false;
+        }
+        if ("FORMAL".equals(data.getStatus())) {
+            return "PASS".equals(data.getFormalApproved());
+        }
+        return true;
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "新增合同，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -1314,7 +1326,15 @@ public class ContractDistributorStandardServiceImpl extends
             contractDistributorLine.setAmountExcludingTax(lineVo.getAmountExcludingTax());
             contractDistributorLine.setTotalAmount(lineVo.getTotalAmount());
             contractDistributorLine.setDeliveryDate(lineVo.getDeliveryDate());
+            contractDistributorLine.setMaterialCode(lineVo.getMaterialCode());
             contractDistributorLineService.getBaseMapper().insert(contractDistributorLine);
+
+            //更新物料编码
+            Wrapper<ContractDistributorLine> contractDistributorLineWrapper = Wrappers.lambdaUpdate(ContractDistributorLine.class)
+                    .set(ContractDistributorLine::getMaterialCode, lineVo.getMaterialCode())
+                    .eq(ContractDistributorLine::getId, lineVo.getId());
+
+            contractDistributorLineService.update(contractDistributorLineWrapper);
         }
         Wrapper<ContractDistributorStandard> changeLocked = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/statistics/ShipmentQuantityIndustryStatisticsServiceImpl.java
View file @74f29d2
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/statistics/ShipmentQuantityIndustryStatisticsServiceImpl.java
View file @74f29d2
@@ -108,6 +108,10 @@ public class ShipmentQuantityIndustryStatisticsServiceImpl implements ShipmentQu
     }
     private List<ShipmentQuantityIndustryStatisticsDto> buildFilledList(QueryShipmentQuantityIndustryStatisticsVo vo) {
+        if (!hasAccessibleBaseData(vo)) {
+            return new ArrayList<>();
+        }
+
         LocalDate startDate = parse(vo.getShipmentDateStart());
         LocalDate endDate = parse(vo.getShipmentDateEnd());
         LocalDate today = LocalDate.now();
@@ -220,6 +224,15 @@ public class ShipmentQuantityIndustryStatisticsServiceImpl implements ShipmentQu
         return date + "|" + industry + "|" + workshopId;
     }
+    private boolean hasAccessibleBaseData(QueryShipmentQuantityIndustryStatisticsVo vo) {
+        QueryShipmentQuantityIndustryStatisticsVo permissionCheckVo = new QueryShipmentQuantityIndustryStatisticsVo();
+        permissionCheckVo.setIndustry(vo.getIndustry());
+        permissionCheckVo.setWorkshopId(vo.getWorkshopId());
+
+        ShipmentQuantityStatisticsDateRangeDto dateRange = shipmentQuantityIndustryStatisticsMapper.queryDateRange(permissionCheckVo);
+        return dateRange != null && dateRange.getStartDate() != null && dateRange.getEndDate() != null;
+    }
+
     private ShipmentQuantityStatisticsDateRangeDto queryDateRangeWithFallback(QueryShipmentQuantityIndustryStatisticsVo vo) {
         ShipmentQuantityStatisticsDateRangeDto dateRange = shipmentQuantityIndustryStatisticsMapper.queryDateRange(vo);
         if (dateRange != null && dateRange.getStartDate() != null && dateRange.getEndDate() != null) {
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/statistics/ShipmentQuantityStatisticsServiceImpl.java
View file @74f29d2
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/statistics/ShipmentQuantityStatisticsServiceImpl.java
View file @74f29d2
@@ -109,6 +109,10 @@ public class ShipmentQuantityStatisticsServiceImpl implements ShipmentQuantitySt
     }
     private List<ShipmentQuantityStatisticsDto> buildFilledList(QueryShipmentQuantityStatisticsVo vo) {
+        if (!hasAccessibleBaseData(vo)) {
+            return new ArrayList<>();
+        }
+
         LocalDate startDate = parse(vo.getShipmentDateStart());
         LocalDate endDate = parse(vo.getShipmentDateEnd());
         LocalDate today = LocalDate.now();
@@ -236,6 +240,15 @@ public class ShipmentQuantityStatisticsServiceImpl implements ShipmentQuantitySt
         return date + "|" + deptId + "|" + workshopId;
     }
+    private boolean hasAccessibleBaseData(QueryShipmentQuantityStatisticsVo vo) {
+        QueryShipmentQuantityStatisticsVo permissionCheckVo = new QueryShipmentQuantityStatisticsVo();
+        permissionCheckVo.setDeptId(vo.getDeptId());
+        permissionCheckVo.setWorkshopId(vo.getWorkshopId());
+
+        ShipmentQuantityStatisticsDateRangeDto dateRange = shipmentQuantityStatisticsMapper.queryDateRange(permissionCheckVo);
+        return dateRange != null && dateRange.getStartDate() != null && dateRange.getEndDate() != null;
+    }
+
     private ShipmentQuantityStatisticsDateRangeDto queryDateRangeWithFallback(QueryShipmentQuantityStatisticsVo vo) {
         ShipmentQuantityStatisticsDateRangeDto dateRange = shipmentQuantityStatisticsMapper.queryDateRange(vo);
         if (dateRange != null && dateRange.getStartDate() != null && dateRange.getEndDate() != null) {
--- a/xingyun-sc/src/main/resources/mappers/statistics/ShipmentQuantityIndustryStatisticsMapper.xml
View file @74f29d2
+++ b/xingyun-sc/src/main/resources/mappers/statistics/ShipmentQuantityIndustryStatisticsMapper.xml
View file @74f29d2
@@ -89,7 +89,8 @@
             MAX(t.shipment_date) AS end_date
         FROM (
             SELECT
-                ol.delivery_date AS shipment_date
+                ol.delivery_date AS shipment_date,
+                o.workshop_id AS workshop_id
             FROM tbl_purchase_order_line ol
             INNER JOIN purchase_order_info o ON o.id = ol.purchase_order_id
             WHERE