1：订货单、撤销单、规格变更单查询接口增加合同类型方便前端判断单位是元还是美元 2：合同锁规可以编辑备注 3：订单明细报表赋值订单类型 经销标准合同-经销 经销…

…库存、外贸库存合同-库存已锁价、库存未锁价 经销未锁规、外贸未锁规合同-未锁规、已锁规 加工标准合同-加工 外贸标准合同-外贸

@@ -409,7 +409,7 @@ CREATE TABLE IF NOT EXISTS `tbl_purchase_order_revoke_line`
     `length_tol_neg`           decimal(10, 4) DEFAULT NULL COMMENT '长度公差负',
     `length_tol_neg`           decimal(10, 4) DEFAULT NULL COMMENT '长度公差负',
     `status`                   varchar(50)    DEFAULT NULL COMMENT '状态',
     `status`                   varchar(50)    DEFAULT NULL COMMENT '状态',
     `quantity`                 decimal(15, 4) NOT NULL COMMENT '原数量kg',
     `quantity`                 decimal(15, 4) NOT NULL COMMENT '原数量kg',
-    `sales_price`              decimal(15, 4) NOT NULL COMMENT '销售价格',
+    `sales_price`              decimal(15, 4) DEFAULT NULL COMMENT '销售价格',
     `delivery_date`            date           DEFAULT NULL COMMENT '发货日期',
     `delivery_date`            date           DEFAULT NULL COMMENT '发货日期',
     `revoke_quantity`          decimal(15, 4) DEFAULT NULL COMMENT '撤销数量',
     `revoke_quantity`          decimal(15, 4) DEFAULT NULL COMMENT '撤销数量',
     `show_order`               int            DEFAULT '0' COMMENT '排序',
     `show_order`               int            DEFAULT '0' COMMENT '排序',

@@ -145,6 +145,12 @@ public class GetPurchaseOrderRevokeBo extends BaseBo<PurchaseOrderRevoke> {
     @ApiModelProperty("订货单撤销表物料行")
     @ApiModelProperty("订货单撤销表物料行")
     private List<PurchaseOrderRevokeLine> purchaseOrderRevokeLineList;
     private List<PurchaseOrderRevokeLine> purchaseOrderRevokeLineList;
 
 
+    /**
+     * 合同类型
+     */
+    @ApiModelProperty("合同类型")
+    private String contractType;
+
     public GetPurchaseOrderRevokeBo() {
     public GetPurchaseOrderRevokeBo() {
 
 
     }
     }

@@ -260,6 +260,12 @@ public class OrderChangeRecordBo extends BaseBo<OrderInfoChangeRecord> {
     @ApiModelProperty("是否是变更发起人")
     @ApiModelProperty("是否是变更发起人")
     private Boolean changeCreateBy;
     private Boolean changeCreateBy;
 
 
+    /**
+     * 合同类型
+     */
+    @ApiModelProperty("合同类型")
+    private String contractType;
+
 
 
     public OrderChangeRecordBo() {
     public OrderChangeRecordBo() {
 
 

@@ -152,6 +152,12 @@ public class GetReplenishmentOrderBo extends BaseBo<ReplenishmentOrder> {
     @ApiModelProperty("补货单物料行")
     @ApiModelProperty("补货单物料行")
     private List<GetReplenishmentOrderLineBo> replenishmentOrderLineList;
     private List<GetReplenishmentOrderLineBo> replenishmentOrderLineList;
 
 
+    /**
+     * 合同类型
+     */
+    @ApiModelProperty("合同类型")
+    private String contractType;
+
     public GetReplenishmentOrderBo() {
     public GetReplenishmentOrderBo() {
 
 
     }
     }

@@ -5,9 +5,13 @@ import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.xingyun.sc.bo.order.change.OrderChangeRecordBo;
 import com.lframework.xingyun.sc.bo.order.change.OrderChangeRecordBo;
+import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.xingyun.sc.entity.OrderInfoChangeRecord;
 import com.lframework.xingyun.sc.entity.OrderInfoChangeRecord;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
+import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.utils.ExcelUtil;
 import com.lframework.xingyun.sc.utils.ExcelUtil;
 import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
 import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
 import com.lframework.xingyun.sc.utils.ResponseUtil;
 import com.lframework.xingyun.sc.utils.ResponseUtil;
@@ -60,6 +64,10 @@ public class OrderChangeRecordController extends DefaultBaseController {
 
 
     @Resource
     @Resource
     private OrderChangeRecordService orderChangeRecordService;
     private OrderChangeRecordService orderChangeRecordService;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private ContractDistributorStandardService contractDistributorStandardService;
 
 
     /**
     /**
      * 查询列表
      * 查询列表
@@ -90,6 +98,16 @@ public class OrderChangeRecordController extends DefaultBaseController {
             throw new DefaultClientException("订货单变更记录不存在！");
             throw new DefaultClientException("订货单变更记录不存在！");
         }
         }
         OrderChangeRecordBo result = new OrderChangeRecordBo(data);
         OrderChangeRecordBo result = new OrderChangeRecordBo(data);
+        PurchaseOrderInfo purchaseOrderInfo = purchaseOrderInfoService.findById(result.getOrderId());
+        if (purchaseOrderInfo != null) {
+            String contractId = purchaseOrderInfo.getContractId();
+            if (StringUtils.isNotEmpty(contractId)) {
+                ContractDistributorStandard contractDistributorStandard = contractDistributorStandardService.findById(contractId);
+                if (contractDistributorStandard != null) {
+                    result.setContractType(contractDistributorStandard.getType());
+                }
+            }
+        }
 
 
         return InvokeResultBuilder.success(result);
         return InvokeResultBuilder.success(result);
     }
     }

@@ -16,6 +16,7 @@ import javax.validation.constraints.NotBlank;
 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderInfoBo;
 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderInfoBo;
 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderRevokeBo;
 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderRevokeBo;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.entity.*;
+import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeLineService;
@@ -28,6 +29,7 @@ import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -58,6 +60,8 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
     private PurchaseOrderRevokeLineService purchaseOrderRevokeLineService;
     private PurchaseOrderRevokeLineService purchaseOrderRevokeLineService;
     @Resource
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private ContractDistributorStandardService contractDistributorStandardService;
 
 
     /**
     /**
      * 查询列表
      * 查询列表
@@ -124,6 +128,16 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
         if (CollectionUtil.isNotEmpty(query)) {
         if (CollectionUtil.isNotEmpty(query)) {
             result.setPurchaseOrderRevokeLineList(query);
             result.setPurchaseOrderRevokeLineList(query);
         }
         }
+        PurchaseOrderInfo purchaseOrderInfo = purchaseOrderInfoService.findById(data.getPurchaseOrderId());
+        if (purchaseOrderInfo != null) {
+            String contractId = purchaseOrderInfo.getContractId();
+            if (StringUtils.isNotEmpty(contractId)) {
+                ContractDistributorStandard contractDistributorStandard = contractDistributorStandardService.findById(contractId);
+                if (contractDistributorStandard != null) {
+                    result.setContractType(contractDistributorStandard.getType());
+                }
+            }
+        }
 
 
         return InvokeResultBuilder.success(result);
         return InvokeResultBuilder.success(result);
     }
     }

@@ -26,9 +26,11 @@ import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVo;
 import com.lframework.xingyun.sc.bo.purchase.GetReplenishmentOrderBo;
 import com.lframework.xingyun.sc.bo.purchase.GetReplenishmentOrderBo;
 import com.lframework.xingyun.sc.bo.purchase.GetReplenishmentOrderLineBo;
 import com.lframework.xingyun.sc.bo.purchase.GetReplenishmentOrderLineBo;
 import com.lframework.xingyun.sc.bo.purchase.QueryReplenishmentOrderBo;
 import com.lframework.xingyun.sc.bo.purchase.QueryReplenishmentOrderBo;
+import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.ReplenishmentOrder;
 import com.lframework.xingyun.sc.entity.ReplenishmentOrder;
 import com.lframework.xingyun.sc.entity.ReplenishmentOrderLine;
 import com.lframework.xingyun.sc.entity.ReplenishmentOrderLine;
+import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderLineService;
 import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderLineService;
 import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderService;
 import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderService;
@@ -77,6 +79,8 @@ public class ReplenishmentOrderController extends DefaultBaseController {
     private ReplenishmentOrderLineService replenishmentOrderLineService;
     private ReplenishmentOrderLineService replenishmentOrderLineService;
     @Resource
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private ContractDistributorStandardService contractDistributorStandardService;
 
 
 
 
     public static final String AUDIT_STATUS_DIC_CODE = "AUDIT_STATUS"; // 审核状态
     public static final String AUDIT_STATUS_DIC_CODE = "AUDIT_STATUS"; // 审核状态
@@ -195,6 +199,13 @@ public class ReplenishmentOrderController extends DefaultBaseController {
         result.setStatusName(sysDataDicItem == null ? "" : sysDataDicItem.getName());
         result.setStatusName(sysDataDicItem == null ? "" : sysDataDicItem.getName());
         PurchaseOrderInfo purchaseOrderInfo = purchaseOrderInfoService.findById(data.getPurchaseOrderId());
         PurchaseOrderInfo purchaseOrderInfo = purchaseOrderInfoService.findById(data.getPurchaseOrderId());
         result.setPurchaseOrderName(purchaseOrderInfo == null ? "" : purchaseOrderInfo.getOrderNo());
         result.setPurchaseOrderName(purchaseOrderInfo == null ? "" : purchaseOrderInfo.getOrderNo());
+        String contractId = purchaseOrderInfo.getContractId();
+        if (StringUtils.isNotEmpty(contractId)) {
+            ContractDistributorStandard contractDistributorStandard = contractDistributorStandardService.findById(contractId);
+            if (contractDistributorStandard != null) {
+                result.setContractType(contractDistributorStandard.getType());
+            }
+        }
 
 
         Wrapper<ReplenishmentOrderLine> lineWrapper = Wrappers.lambdaQuery(ReplenishmentOrderLine.class)
         Wrapper<ReplenishmentOrderLine> lineWrapper = Wrappers.lambdaQuery(ReplenishmentOrderLine.class)
                 .eq(ReplenishmentOrderLine::getReplenishmentOrderId, id)
                 .eq(ReplenishmentOrderLine::getReplenishmentOrderId, id)

@@ -1455,6 +1455,7 @@ public class ContractDistributorStandardServiceImpl extends
         data.setPerformance(vo.getPerformance());
         data.setPerformance(vo.getPerformance());
         data.setComponent(vo.getComponent());
         data.setComponent(vo.getComponent());
         data.setPackaging(vo.getPackaging());
         data.setPackaging(vo.getPackaging());
+        data.setRemarks(vo.getRemarks());
 //        data.setStandardizedAt(LocalDateTime.now());
 //        data.setStandardizedAt(LocalDateTime.now());
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 

@@ -36,6 +36,7 @@ import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
 import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
+import com.lframework.xingyun.sc.utils.OrderDetailReportUtil;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
@@ -586,7 +587,8 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         vo.setQuality(line.getQuality());
         vo.setQuality(line.getQuality());
         vo.setContractType(orderDetailReport.getContractType());
         vo.setContractType(orderDetailReport.getContractType());
         vo.setStockUpCompanyName(orderInfo.getStockUpCompanyName());
         vo.setStockUpCompanyName(orderInfo.getStockUpCompanyName());
-        //vo.setOrderType();
+        vo.setType(orderInfo.getType());
+        vo.setOrderType(OrderDetailReportUtil.buildOrderType(type, orderInfo.getType()));
         vo.setShowOrder(2);
         vo.setShowOrder(2);
         vo.setCreateById(contractCreateById);
         vo.setCreateById(contractCreateById);
         orderDetailReportService.create(vo);
         orderDetailReportService.create(vo);

@@ -38,6 +38,7 @@ import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
 import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
+import com.lframework.xingyun.sc.utils.OrderDetailReportUtil;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.order.*;
 import com.lframework.xingyun.sc.vo.order.*;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.CreateOrderDetailReportVo;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.CreateOrderDetailReportVo;
@@ -416,7 +417,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                     }
                     }
                 }
                 }
                 vo.setStockUpCompanyName(purchaseOrderInfo.getStockUpCompanyName());
                 vo.setStockUpCompanyName(purchaseOrderInfo.getStockUpCompanyName());
-//                vo.setOrderType();
+                vo.setOrderType(OrderDetailReportUtil.buildOrderType(type, purchaseOrderInfo.getType()));
                 vo.setShowOrder(0);
                 vo.setShowOrder(0);
                 vo.setType(purchaseOrderInfo.getType());
                 vo.setType(purchaseOrderInfo.getType());
                 vo.setCreateById(purchaseOrderInfo.getContractCreateById());
                 vo.setCreateById(purchaseOrderInfo.getContractCreateById());

@@ -26,6 +26,7 @@ import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
 import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
+import com.lframework.xingyun.sc.utils.OrderDetailReportUtil;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.CreateOrderDetailReportVo;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.CreateOrderDetailReportVo;
@@ -408,7 +409,7 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
                             }
                             }
                         }
                         }
                         vo.setStockUpCompanyName(purchaseOrderInfo.getStockUpCompanyName());
                         vo.setStockUpCompanyName(purchaseOrderInfo.getStockUpCompanyName());
-                        //vo.setOrderType();
+                        vo.setOrderType(OrderDetailReportUtil.buildOrderType(type, purchaseOrderInfo.getType()));
                         vo.setShowOrder(0);
                         vo.setShowOrder(0);
                         vo.setType(purchaseOrderInfo.getType());
                         vo.setType(purchaseOrderInfo.getType());
                         vo.setCreateById(purchaseOrderInfo.getContractCreateById());
                         vo.setCreateById(purchaseOrderInfo.getContractCreateById());

+package com.lframework.xingyun.sc.utils;
+
+/**
+ * 订单明细报表工具类。
+ */
+public final class OrderDetailReportUtil {
+
+    private OrderDetailReportUtil() {
+    }
+
+    /**
+     * 根据合同类型和订货单类型构建订单类型展示值。
+     *
+     * @param contractType      合同类型
+     * @param purchaseOrderType 订货单类型
+     * @return                  订单类型展示值
+     */
+    public static String buildOrderType(String contractType, String purchaseOrderType) {
+        if ("DISTRIB_STD".equals(contractType)) {
+            return "经销";
+        }
+        if ("INTL_STD_CONTRACT".equals(contractType)) {
+            return "外贸";
+        }
+        if ("PROCESS_STD_AGMT".equals(contractType)) {
+            return "加工";
+        }
+        if ("DIST_STOCK_CONTRACT".equals(contractType) || "INTL_INVENTORY_AGMT".equals(contractType)) {
+            if ("NO_PRODUCTION".equals(purchaseOrderType)) {
+                return "库存已锁价";
+            }
+            if ("PRODUCTION".equals(purchaseOrderType)) {
+                return "库存未锁价";
+            }
+            return "库存";
+        }
+        if ("DRAFT_DIST_AGMT".equals(contractType) || "INTL_OPEN_SPEC_AGMT".equals(contractType)) {
+            if ("NO_PRODUCTION".equals(purchaseOrderType)) {
+                return "未锁规";
+            }
+            if ("PRODUCTION".equals(purchaseOrderType)) {
+                return "已锁规";
+            }
+            return "未锁规";
+        }
+        return "";
+    }
+}