供应商

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -99,6 +99,7 @@
         <result column="out_amt" property="outAmt"/>
         <result column="return_qty" property="returnQty"/>
         <result column="return_amt" property="returnAmt"/>
+        <result column="channel_id" property="channelId" typeHandler="UuidTypeHandler"/>
 <!--        <result column="amt_receivable" property="amtReceivable"/>-->
 <!--        <result column="amt_handle" property="amtHandle"/>-->
 <!--        <result column="amt_residue" property="amtResidue"/>-->
@@ -454,6 +455,9 @@
             <if test="outStatusList != null and outStatusList.size() > 0">
                 AND t.out_status  =any(#{outStatusList, typeHandler=StringListTypeHandler})
             </if>
+            <if test="salesChannelList != null and salesChannelList.size() > 0">
+                AND t.sales_channel  =any(#{salesChannelList, typeHandler=uuidListTypeHandler})
+            </if>
             <if test="deliveryDateStart != null and deliveryDateEnd != null">
                 AND t.delivery_date &gt;= #{deliveryDateStart}::timestamp with time zone
                 AND t.delivery_date &lt; #{deliveryDateEnd}::timestamp with time zone + interval '1 day'
@@ -758,6 +762,7 @@
                t.contact_name,
                t.contact_phone,
                t.sales_channel,
+               tmsc.channel_id ,
                tmsc.channel_name                                 as "channelName",
                t.delivery_date,
                sys.f_remove_zero(t.sum_quantity) as sum_quantity,

src/main/java/com/dk/mdm/model/query/sale/OrderQuery.java

@@ -356,6 +356,9 @@ public class OrderQuery extends PageInfo<OrderQuery> implements Serializable {
     @ApiModelProperty(value = "业务员List")
     private List<String> staffIdList;
 
+    @ApiModelProperty(value = "销售渠道List")
+    private List<String> salesChannelList;
+
     @ApiModelProperty(value = "出库状态List")
     private List<String> outStatusList;
 

src/main/java/com/dk/mdm/service/mst/GoodsSkuService.java

@@ -141,6 +141,8 @@ public class GoodsSkuService extends BaseService<GoodsSku> {
 			inboundItemVO.setIntoingQty(goodsSkuVO.getIntoQty());
 			inboundItemVO.setIntoingAmt(goodsSkuVO.getIntoQty().multiply(goodsSkuVO.getPriceInto()));
 			inboundItemVO.setPriceInto(goodsSkuVO.getPriceInto());
+			inboundItemVO.setCostPrice(goodsSkuVO.getPriceInto());
+			inboundItemVO.setIntoAmt(goodsSkuVO.getIntoQty().multiply(goodsSkuVO.getPriceInto()));
 			inboundItemVO.setIntoQty(goodsSkuVO.getIntoQty());
 			inboundItemVO.setItemIndex(0);
 			inboundItemVO.setSkuId(goodsSku.getSkuId());

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -15,6 +15,7 @@ import com.dk.mdm.infrastructure.convert.sale.OrderConvert;
 import com.dk.mdm.infrastructure.convert.sale.OrderItemConvert;
 import com.dk.mdm.infrastructure.convert.sale.OutBoundDtoConvert;
 import com.dk.mdm.mapper.common.CommonMapper;
+import com.dk.mdm.mapper.ivt.OutboundItemMapper;
 import com.dk.mdm.mapper.mac.AccountItemMapper;
 import com.dk.mdm.mapper.mac.RecPayHandleItemMapper;
 import com.dk.mdm.mapper.mac.RecPayItemMapper;
@@ -37,6 +38,7 @@ import com.dk.mdm.model.pojo.sale.Order;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.pojo.sale.OrderItem;
+import com.dk.mdm.model.query.ivt.OutboundItemQuery;
 import com.dk.mdm.model.query.mac.RecPayItemQuery;
 import com.dk.mdm.model.query.mac.RecPayQuery;
 import com.dk.mdm.model.query.sale.MultiOwnerQuery;
@@ -146,6 +148,9 @@ public class OrderService extends BaseService<Order> {
     @Autowired
     private OutBoundDtoConvert outBoundDtoConvert;
 
+    @Autowired
+    private OutboundItemMapper outboundItemMapper;
+
     /**
      * @desc : 条件查询
      * @author : 付斌
@@ -526,6 +531,16 @@ public class OrderService extends BaseService<Order> {
             orderItemVO.setItemId(orderItem.getItemId());
             orderItemVO.setOrderId(orderVO.getOrderId());
         }
+
+        // 商户产品版本
+        String gradeCode = "PRO";
+        Map<String, Object> paramCompany = new HashMap<>();
+        paramCompany.put("cpId", orderVO.getCpId());
+        List<Map<String, Object>> listCompany = commonMapper.getCompany(paramCompany);
+        if (listCompany.size() > 0) {
+            gradeCode = listCompany.get(0).get("gradeCode").toString();
+        }
+
         // 编辑的
         List<OrderItemVO> editOrderItemVOList = orderVO.getItemList().stream().filter(it -> it.getItemId() != null).collect(Collectors.toList());
         for (OrderItemVO orderItemVO : editOrderItemVOList) {
@@ -546,6 +561,35 @@ public class OrderService extends BaseService<Order> {
             }
             OrderItem orderItem = orderItemConvert.convertToPo(orderItemVO);
             orderItemService.updateByUuid(orderItem);
+            // 免费版：
+            // 订单编辑钱保存，要更改对应出库单的钱
+            // 订单编辑数量保存，要更改对应出库单数量，并且更新库存；更改后数量不能小于退货数量；
+            // 专业版：编辑保持原逻辑
+            if ("STD".equals(gradeCode)) {  //免費版特加逻辑
+                //更改后数量不能小于退货数量；
+                if(orderItemVO.getItemQty().compareTo(orderItemForUpdate.getReturnQty()) == -1){
+                    throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.GOODSQTY_NO_LESS_RETURNQTY.getMessage());
+                }
+                //
+                if (outintOrOutQty.compareTo(BigDecimal.ZERO) > 0) { //有出库数据
+//                    OutboundVO outboundVO = outBoundDtoConvert.convertToPo(orderVO);
+//                    outboundVO.setOutDate(LocalDate.now());
+//                    outboundVO.setOutingQty(orderVO.getSumQuantity());
+//                    outboundVO.setOutingAmt(orderVO.getFactAmt());
+//                    outboundVO.setFlgAutoHandle(orderVO.getFlgAutoHandle());
+//                    outboundVO.setFlgHandleSetting(orderVO.getFlgHandleSetting());
+//                    outboundVO.setFromId(order.getOrderId());
+//                    outboundVO.setFromNo(order.getOrderNo());
+//                    outboundVO.setOutDate(orderVO.getDeliveryDate());
+//                    outboundVO.setFactAmt(orderVO.getFactAmt());
+//                    outboundVO.setDiscount(orderVO.getDiscount());
+//                    outboundVO.setDiscAmt(orderVO.getDiscAmt());
+//                    outboundVO.setSumAmount(orderVO.getSumAmount());
+//                    outboundSaleOrderService.saleOutboundUpdate( outboundVO);
+                }
+//                outboundItemMapper.selectByCond(new OutboundItemQuery().setFromItemId(orderItem.getItemId()));
+
+            }
         }
 
         // 删除业绩信息
@@ -607,14 +651,6 @@ public class OrderService extends BaseService<Order> {
             }
         }
 
-        // 商户产品版本
-        String gradeCode = "PRO";
-        Map<String, Object> paramCompany = new HashMap<>();
-        paramCompany.put("cpId", orderVO.getCpId());
-        List<Map<String, Object>> listCompany = commonMapper.getCompany(paramCompany);
-        if (listCompany.size() > 0) {
-            gradeCode = listCompany.get(0).get("gradeCode").toString();
-        }
 
         // 专业版有定金
         if ("PRO".equals(gradeCode)) {
@@ -763,7 +799,7 @@ public class OrderService extends BaseService<Order> {
             accountService.updateMac(macId);
         }
         /**************************************** 客户收款end ********************************/
-        if(insertOrderItemVOList.size()>0){ //编辑生产出库单
+        if(insertOrderItemVOList.size()>0){ //编辑时新选的数据生成出库单
 
             //开单并出库办理
             if (orderVO.getOutboundProcessingFlag() != null && orderVO.getOutboundProcessingFlag()) {