楚江erp: 发货明细表相关接口开发

@@ -25,11 +25,13 @@ import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService;
 import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService;
 import com.lframework.xingyun.sc.service.purchase.ReceiveSheetService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
+import com.lframework.xingyun.sc.service.statistics.ShipmentDetailStatisticsService;
 import com.lframework.xingyun.sc.service.stock.adjust.StockAdjustReasonService;
 import com.lframework.xingyun.sc.service.stock.take.PreTakeStockSheetService;
 import com.lframework.xingyun.sc.service.stock.take.TakeStockPlanService;
 import com.lframework.xingyun.sc.vo.purchase.PurchaseOrderSelectorVo;
 import com.lframework.xingyun.sc.vo.purchase.receive.ReceiveSheetSelectorVo;
+import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.QueryShipmentDetailStatisticsVo;
 import com.lframework.xingyun.sc.vo.stock.adjust.stock.reason.StockAdjustReasonSelectorVo;
 import com.lframework.xingyun.sc.vo.stock.take.plan.TakeStockPlanSelectorVo;
 import com.lframework.xingyun.sc.vo.stock.take.pre.PreTakeStockSheetSelectorVo;
@@ -91,6 +93,8 @@ public class ScSelectorController extends DefaultBaseController {
   private SysDeptService sysDeptService;
   @Resource
   private ShipmentsPlanDetailService shipmentsPlanDetailService;
+  @Resource
+  private ShipmentDetailStatisticsService shipmentDetailStatisticsService;
 
 
   /**
@@ -448,4 +452,16 @@ public class ScSelectorController extends DefaultBaseController {
       }
     }
   }
+
+
+    /**
+     * 根据ID加载发货明细数据
+     */
+    @ApiOperation("根据ID加载发货明细数据")
+    @PostMapping("/shipmentDetail/load")
+    public InvokeResult<List<ShipmentDetailStatistics>> loadShipmentDetail(@RequestBody(required = false) List<String> ids) {
+        QueryShipmentDetailStatisticsVo vo = new QueryShipmentDetailStatisticsVo();
+        vo.setIds(ids);
+        return InvokeResultBuilder.success(shipmentDetailStatisticsService.queryShipmentDetail(vo));
+    }
 }

@@ -83,12 +83,12 @@ public class ShipmentDetailStatisticsController extends DefaultBaseController {
     }
 
     /**
-     * 根据发货单ID获取发货明细数据
+     * 查询发货明细数据
      */
-    @ApiOperation("根据发货单ID获取发货明细数据")
-    @HasPermission({"statistics:shipmentDetail:modify"})
-    @GetMapping("/getByShipmentOrderId")
-    public InvokeResult<List<ShipmentDetailStatistics>> getByShipmentOrderId(@NotBlank(message = "id不能为空！") String shipmentOrderId) {
-        return InvokeResultBuilder.success(shipmentDetailStatisticsService.getShipmentDetailInfo(shipmentOrderId));
+    @ApiOperation("查询发货明细数据")
+    @HasPermission({"statistics:shipmentDetail:add"})
+    @GetMapping("/queryShipmentDetail")
+    public InvokeResult<PageResult<ShipmentDetailStatistics>> queryShipmentDetail(QueryShipmentDetailStatisticsVo vo) {
+        return InvokeResultBuilder.success(shipmentDetailStatisticsService.pageShipmentDetail(getPageIndex(vo), getPageSize(vo), vo));
     }
 }

@@ -35,6 +35,12 @@ public class ShipmentDetailStatistics extends BaseEntity implements BaseDto {
     private String shipmentOrderNo;
 
     /**
+     * 生产厂ID
+     */
+    @TableField(exist = false)
+    private String workshopId;
+
+    /**
      * 生产厂
      */
     private String workshopName;
@@ -73,6 +79,18 @@ public class ShipmentDetailStatistics extends BaseEntity implements BaseDto {
     private String orderingUnitName;
 
     /**
+     * 合同ID
+     */
+    @TableField(exist = false)
+    private String contractId;
+
+    /**
+     * 合同类型
+     */
+    @TableField(exist = false)
+    private String contractType;
+
+    /**
      * 牌号
      */
     private String brand;
@@ -214,6 +232,18 @@ public class ShipmentDetailStatistics extends BaseEntity implements BaseDto {
     private String settlementTerms;
 
     /**
+     * 原材料与产品数量比
+     */
+    @TableField(exist = false)
+    private String materialProductRatio;
+
+    /**
+     * 原材料与产品数量比备注
+     */
+    @TableField(exist = false)
+    private String materialProductRatioRemarks;
+
+    /**
      * 加工、经销
      */
     private String processingOrDistribution;

@@ -3,10 +3,17 @@ package com.lframework.xingyun.sc.impl.statistics;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
 import com.lframework.starter.web.inner.entity.SysDept;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.xingyun.basedata.entity.Customer;
+import com.lframework.xingyun.basedata.entity.CustomerShort;
+import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
+import com.lframework.xingyun.basedata.service.customer.CustomerShortService;
+import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
+import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.xingyun.sc.entity.ShipmentDetailStatistics;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -20,6 +27,8 @@ import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.mappers.ShipmentDetailStatisticsMapper;
+import com.lframework.xingyun.sc.service.contract.ContractStdProcessingLineService;
+import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.statistics.ShipmentDetailStatisticsService;
 import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.CreateShipmentDetailStatisticsVo;
 import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.QueryShipmentDetailStatisticsVo;
@@ -41,6 +50,16 @@ public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<Shipm
     private SysDeptService sysDeptService;
     @Resource
     private CustomerService customerService;
+    @Resource
+    private CustomerShortService customerShortService;
+    @Resource
+    private CustomerCreditService customerCreditService;
+    @Resource
+    private SysDataDicItemService sysDataDicItemService;
+    @Resource
+    private ContractStdProcessingLineService contractStdProcessingLineService;
+    @Resource
+    private WorkshopService workshopService;
 
 
     @Override
@@ -142,16 +161,26 @@ public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<Shipm
     }
 
     @Override
-    public List<ShipmentDetailStatistics> getShipmentDetailInfo(String shipmentOrderId) {
-        if (StringUtils.isBlank(shipmentOrderId)) {
-            return Collections.emptyList();
-        }
-        List<ShipmentDetailStatistics> shipmentDetailInfo = getBaseMapper().getShipmentDetailInfo(shipmentOrderId);
+    public PageResult<ShipmentDetailStatistics> pageShipmentDetail(Integer pageIndex, Integer pageSize, QueryShipmentDetailStatisticsVo vo) {
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<ShipmentDetailStatistics> dataList = this.queryShipmentDetail(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(dataList));
+    }
+
+    @Override
+    public List<ShipmentDetailStatistics> queryShipmentDetail(QueryShipmentDetailStatisticsVo vo) {
+        List<ShipmentDetailStatistics> shipmentDetailInfo = getBaseMapper().getShipmentDetailInfo(vo);
         if (CollectionUtils.isEmpty(shipmentDetailInfo)) {
             return Collections.emptyList();
         }
         List<String> deptIds = new ArrayList<>();
         List<String> customerIds = new ArrayList<>();
+        List<String> contractIds = new ArrayList<>();
+        List<String> workshopIds = new ArrayList<>();
         for (ShipmentDetailStatistics detail : shipmentDetailInfo) {
             if (StringUtils.isNotBlank(detail.getDeptId()) && !deptIds.contains(detail.getDeptId())) {
                 deptIds.add(detail.getDeptId());
@@ -165,36 +194,87 @@ public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<Shipm
             if (StringUtils.isNotBlank(detail.getStockUpCompany()) && !customerIds.contains(detail.getStockUpCompany())) {
                 customerIds.add(detail.getStockUpCompany());
             }
+            if (StringUtils.isNotBlank(detail.getContractId()) && !contractIds.contains(detail.getContractId())) {
+                contractIds.add(detail.getContractId());
+            }
+            if (StringUtils.isNotBlank(detail.getWorkshopId()) && !workshopIds.contains(detail.getWorkshopId())) {
+                workshopIds.add(detail.getWorkshopId());
+            }
         }
-        Map<String, SysDept> deptMap = new HashMap<>();
+        // 获取厂房数据
+        List<Workshop> workshopList = workshopService.listByIds(workshopIds);
+        Map<String, String> workshopMap = workshopList.stream().collect(Collectors.toMap(Workshop::getId, Workshop::getName));
         // 获取部门数据
         List<SysDept> deptList = sysDeptService.listByIds(deptIds);
-        if (CollectionUtils.isNotEmpty(deptList)) {
-            deptMap = deptList.stream().collect(Collectors.toMap(SysDept::getId, Function.identity()));
-        }
-        Map<String, Customer> customerMap = new HashMap<>();
+        Map<String, SysDept> deptMap = deptList.stream().collect(Collectors.toMap(SysDept::getId, Function.identity()));
         // 获取公司数据
         List<Customer> customerList = customerService.listByIds(customerIds);
-        if (CollectionUtils.isNotEmpty(customerList)) {
-            customerMap = customerList.stream().collect(Collectors.toMap(Customer::getId, Function.identity()));
-        }
+        Map<String, Customer> customerMap = customerList.stream().collect(Collectors.toMap(Customer::getId, Function.identity()));
+        // 客户简称数据
+        List<CustomerShort> customerShortList = customerShortService.listByCustomerId(customerIds);
+        Map<String, String> customerShortMap = customerShortList.stream()
+                .collect(Collectors.toMap(CustomerShort::getCustomerId, CustomerShort::getShortName, (v1, v2) -> v1));
+        // 客户资信数据
+        List<CustomerCredit> customerCreditList = customerCreditService.listByCustomerId(customerIds);
+        Map<String, CustomerCredit> customerCreditMap = customerCreditList.stream()
+                .collect(Collectors.toMap(CustomerCredit::getCompanyId, Function.identity(), (v1, v2) -> v1));
+        // 企业类型数据字典
+        List<SysDataDicItem> enterpriseTypeList = sysDataDicItemService.findByDicCode("ENTERPRISE_TYPE");
+        Map<String, String> enterpriseTypeMap = enterpriseTypeList.stream()
+                .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName, (v1, v2) -> v1));
+        // 原材料与产品数量比
+        List<SysDataDicItem> materialAndQuantityRatioList = sysDataDicItemService.findByDicCode("RAW_TO_PROD_RATIO");
+        Map<String, String> materialAndQuantityRatioMap = materialAndQuantityRatioList.stream()
+                .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName, (v1, v2) -> v1));
         for (ShipmentDetailStatistics detail : shipmentDetailInfo) {
+            // 厂房
+            String workshopName = workshopMap.get(detail.getWorkshopId());
+            detail.setWorkshopName(workshopName);
+            // 办事处
             SysDept sysDept = deptMap.get(detail.getDeptId());
             if (sysDept != null) {
                 detail.setDeptName(sysDept.getName());
             }
+            // 区域
             SysDept region = deptMap.get(detail.getRegion());
             if (region != null) {
                 detail.setRegionName(region.getName());
             }
+            // 客户类型
             Customer orderingUnit = customerMap.get(detail.getOrderingUnit());
             if (orderingUnit != null) {
                 detail.setOrderingUnitName(orderingUnit.getName());
+                CustomerCredit customerCredit = customerCreditMap.get(orderingUnit.getId());
+                if (customerCredit != null) {
+                    String enterpriseType = enterpriseTypeMap.get(customerCredit.getEnterpriseType());
+                    detail.setCustomerType(enterpriseType);
+                }
             }
+            // 备货单位
             Customer stockUpCompany = customerMap.get(detail.getStockUpCompany());
             if (stockUpCompany != null) {
                 detail.setStockUpCompanyName(stockUpCompany.getName());
             }
+            // 简称
+            String shortName = customerShortMap.get(detail.getOrderingUnit());
+            if (StringUtils.isNotBlank(shortName)) {
+                detail.setCustomerShortName(shortName);
+            }
+            // 回程运费
+            if ("PROCESS_STD_AGMT".equals(detail.getContractType())) {
+                // 加工
+                detail.setReturnFreight(detail.getShippingCost());
+                detail.setShippingCost(null);
+            }
+            // 加工、经销
+            if (StringUtils.isNotBlank(detail.getMaterialProductRatio())) {
+                String materialProductRatio = materialAndQuantityRatioMap.get(detail.getMaterialProductRatio());
+                if ("10".equals(detail.getMaterialProductRatio())) {
+                    detail.setProcessingOrDistribution(materialProductRatio + "加工");
+                } else {
+                    detail.setProcessingOrDistribution(detail.getMaterialProductRatioRemarks() + "加工");
+                }
+            }
         }
         return shipmentDetailInfo;
     }

@@ -25,8 +25,8 @@ public interface ShipmentDetailStatisticsMapper extends BaseMapper<ShipmentDetai
     /**
      * 获取发货明细数据
      *
-     * @param shipmentOrderId   发货单ID
-     * @return                  List<ShipmentDetailStatistics>
+     * @param QueryShipmentDetailStatisticsVo   发货单ID集合
+     * @return                                  List<ShipmentDetailStatistics>
      */
-    List<ShipmentDetailStatistics> getShipmentDetailInfo(String shipmentOrderId);
+    List<ShipmentDetailStatistics> getShipmentDetailInfo(@Param("vo") QueryShipmentDetailStatisticsVo vo);
 }

@@ -54,8 +54,16 @@ public interface ShipmentDetailStatisticsService extends BaseMpService<ShipmentD
     /**
      * 获取发货明细数据
      *
-     * @param shipmentOrderId   发货单ID
-     * @return                  List<ShipmentDetailStatistics>
+     * @param QueryShipmentDetailStatisticsVo   查询条件
+     * @return                                  List<ShipmentDetailStatistics>
      */
-    List<ShipmentDetailStatistics> getShipmentDetailInfo(String shipmentOrderId);
+    PageResult<ShipmentDetailStatistics> pageShipmentDetail(Integer pageIndex, Integer pageSize, QueryShipmentDetailStatisticsVo vo);
+
+    /**
+     * 获取发货明细数据
+     *
+     * @param QueryShipmentDetailStatisticsVo   查询条件
+     * @return                                  List<ShipmentDetailStatistics>
+     */
+    List<ShipmentDetailStatistics> queryShipmentDetail(QueryShipmentDetailStatisticsVo vo);
 }

@@ -58,6 +58,14 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
     private String orderingUnitName;
 
     /**
+     * 合同类型
+     */
+    @ApiModelProperty(value = "合同类型", required = true)
+    @NotBlank(message = "请输入合同类型！")
+    @Length(message = "合同类型最多允许20个字符！")
+    private String contractType;
+
+    /**
      * 牌号
      */
     @ApiModelProperty(value = "牌号", required = true)
@@ -68,23 +76,21 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
     /**
      * 厚度
      */
-    @ApiModelProperty(value = "厚度", required = true)
-    @NotNull(message = "请输入厚度！")
+    @ApiModelProperty(value = "厚度")
     @TypeMismatch(message = "厚度格式有误！")
     private Double thickness;
 
     /**
      * 宽度
      */
-    @ApiModelProperty(value = "宽度", required = true)
-    @NotNull(message = "请输入宽度！")
+    @ApiModelProperty(value = "宽度")
     @TypeMismatch(message = "宽度格式有误！")
     private Double width;
 
     /**
      * 长度
      */
-    @ApiModelProperty(value = "长度", required = true)
+    @ApiModelProperty(value = "长度")
     @NotNull(message = "请输入长度！")
     @TypeMismatch(message = "长度格式有误！")
     private Double length;
@@ -92,7 +98,7 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
     /**
      * 状态
      */
-    @ApiModelProperty(value = "状态", required = true)
+    @ApiModelProperty(value = "状态")
     @NotBlank(message = "请输入状态！")
     @Length(message = "状态最多允许50个字符！")
     private String status;
@@ -125,56 +131,49 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
     /**
      * 厚度公差正
      */
-    @ApiModelProperty(value = "厚度公差正", required = true)
-    @NotNull(message = "请输入厚度公差正！")
+    @ApiModelProperty(value = "厚度公差正")
     @TypeMismatch(message = "厚度公差正格式有误！")
     private Double thicknessTolPos;
 
     /**
      * 厚度公差负
      */
-    @ApiModelProperty(value = "厚度公差负", required = true)
-    @NotNull(message = "请输入厚度公差负！")
+    @ApiModelProperty(value = "厚度公差负")
     @TypeMismatch(message = "厚度公差负格式有误！")
     private Double thicknessTolNeg;
 
     /**
      * 宽度公差正
      */
-    @ApiModelProperty(value = "宽度公差正", required = true)
-    @NotNull(message = "请输入宽度公差正！")
+    @ApiModelProperty(value = "宽度公差正")
     @TypeMismatch(message = "宽度公差正格式有误！")
     private Double widthTolPos;
 
     /**
      * 宽度公差负
      */
-    @ApiModelProperty(value = "宽度公差负", required = true)
-    @NotNull(message = "请输入宽度公差负！")
+    @ApiModelProperty(value = "宽度公差负")
     @TypeMismatch(message = "宽度公差负格式有误！")
     private Double widthTolNeg;
 
     /**
      * 长度公差正
      */
-    @ApiModelProperty(value = "长度公差正", required = true)
-    @NotNull(message = "请输入长度公差正！")
+    @ApiModelProperty(value = "长度公差正")
     @TypeMismatch(message = "长度公差正格式有误！")
     private Double lengthTolPos;
 
     /**
      * 长度公差负
      */
-    @ApiModelProperty(value = "长度公差负", required = true)
-    @NotNull(message = "请输入长度公差负！")
+    @ApiModelProperty(value = "长度公差负")
     @TypeMismatch(message = "长度公差负格式有误！")
     private Double lengthTolNeg;
 
     /**
      * 超协价
      */
-    @ApiModelProperty(value = "超协价", required = true)
-    @NotBlank(message = "请输入超协价！")
+    @ApiModelProperty(value = "超协价")
     @Length(message = "超协价最多允许20个字符！")
     private String assessmentExceedsAgreement;
 

@@ -5,6 +5,7 @@ import com.lframework.starter.web.core.vo.PageVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class QueryShipmentDetailStatisticsVo extends PageVo implements BaseVo, Serializable {
@@ -12,6 +13,12 @@ public class QueryShipmentDetailStatisticsVo extends PageVo implements BaseVo, S
     private static final long serialVersionUID = 1L;
 
     /**
+     * 发货明细ID集合
+     */
+    @ApiModelProperty("发货明细ID集合")
+    private List<String> ids;
+
+    /**
      * 生产厂
      */
     @ApiModelProperty("生产厂")
@@ -29,4 +36,15 @@ public class QueryShipmentDetailStatisticsVo extends PageVo implements BaseVo, S
     @ApiModelProperty("订货单名称")
     private String orderingUnitName;
 
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    /**
+     * 发货单编号
+     */
+    @ApiModelProperty("发货单编号")
+    private String shipmentOrderNo;
 }

@@ -114,11 +114,70 @@
     </select>
 
     <select id="getShipmentDetailInfo" resultType="com.lframework.xingyun.sc.entity.ShipmentDetailStatistics">
-        select ol.*, o.*,w.name as workshop_name,sd.actual_shipment_quantity,sd.yield_batch_no
+        select
+            sd.id,
+            sd.actual_shipment_quantity,
+            sd.yield_batch_no,
+            sd.num,
+            ol.brand,
+            ol.thickness,
+            ol.width,
+            ol.length,
+            ol.status,
+            ol.quantity,
+            ol.sales_price,
+            ol.thickness_tol_pos,
+            ol.thickness_tol_neg,
+            ol.width_tol_pos,
+            ol.width_tol_neg,
+            ol.length_tol_pos,
+            ol.length_tol_neg,
+            ol.assessment_exceeds_agreement,
+            ol.industry,
+            ol.packaging_fee,
+            ol.quality,
+            o.dept_id,
+            o.region,
+            o.ordering_unit,
+            o.shipping_cost,
+            o.delivery_method,
+            o.stock_up_company_id,
+            o.order_no,
+            o.invoicing_status,
+            o.order_date,
+            o.settlement_terms,
+            case
+                when o.supply_unit = 'GJ' then '安徽楚江高精铜带有限公司'
+                when o.supply_unit = 'XC' then '安徽楚江科技新材料股份有限公司'
+            else ''
+            end as supplier,
+            o.workshop_id,
+            so.code as shipment_order_no,
+            so.create_time as shipment_date,
+            sc.id as contract_id,
+            sc.type as contract_type,
+            sc.packaging_requirements,
+            cl.material_product_ratio,
+            cl.material_product_ratio_remarks
         from shipments_plan_detail sd
-                 left join tbl_purchase_order_line ol on sd.order_spec_id = ol.id
-                 left join purchase_order_info o on ol.purchase_order_id = o.id
-                 left join base_data_workshop w on o.workshop_id = w.id
-        where sd.shipment_order_id = #{shipmentOrderId}
+        inner join shipments_order_info so on sd.shipment_order_id = so.id
+        left join tbl_purchase_order_line ol on sd.order_spec_id = ol.id
+        left join purchase_order_info o on ol.purchase_order_id = o.id
+        left join tbl_contract_distributor_standard sc on o.contract_id = sc.id
+        left join tbl_contract_std_processing_line cl on sc.id = cl.contract_id
+        <where>
+            <if test="vo.ids != null and vo.ids.size() > 0">
+                and sd.id in
+                <foreach collection="vo.ids" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="vo.orderNo != null and vo.orderNo != ''">
+                AND o.order_no LIKE CONCAT('%', #{vo.orderNo}, '%')
+            </if>
+            <if test="vo.shipmentOrderNo != null and vo.shipmentOrderNo != ''">
+                AND so.code LIKE CONCAT('%', #{vo.shipmentOrderNo}, '%')
+            </if>
+        </where>
     </select>
 </mapper>