供应商

src/main/java/com/dk/mdm/controller/ivt/outBound/OutboundSaleOrderController.java

@@ -48,6 +48,20 @@ public class OutboundSaleOrderController {
     }
 
     /**
+     * @desc :  销售出库新建和收款
+     * @date : 2024/3/18 15:22
+     * @author : 王英杰
+     */
+    @ApiOperation(
+            value = "销售出库新建",
+            notes = "销售出库新建"
+    )
+    @PostMapping({"outbound_insert_collection"})
+    public ResponseResultVO<?> saleOrderOutboundInsertCollection(@Valid @RequestBody OutboundVO outboundVO) {
+        return outboundSaleOrderService.saleOrderOutboundInsertCollection(outboundVO);
+    }
+
+    /**
      * @desc : 销售出库办理
      * @date : 2024/3/18 15:22
      * @author : 寇珊珊

src/main/java/com/dk/mdm/controller/ivt/outBound/OutboundSaleReturnController.java

@@ -47,7 +47,7 @@ public class OutboundSaleReturnController {
     /**
      * @desc :  销售退货出库新建退款
      * @date : 2024/3/18 15:22
-     * @author : 寇珊珊
+     * @author : 王英杰
      */
     @ApiOperation(
             value = "销售退货出库新建退款",

src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.xml

@@ -204,6 +204,7 @@
         <result column="outing_piece" property="outingPiece"/>
         <result column="out_box" property="box"/>
         <result column="out_piece" property="piece"/>
+        <result column="decimal_places" property="decimalPlaces"/>
     </resultMap>
     <!-- 通用条件列 -->
     <sql id="Condition">
@@ -1130,6 +1131,7 @@
                 ,tpoi.outing_piece  as "list_outing_piece"
                 ,tpoi.out_box  as "list_out_box"
                 ,tpoi.out_piece  as "list_out_piece"
+,tmgu.decimal_places as "list_decimal_places"
     </sql>
 
     <select id="countByCondDetail" resultType="Long">

src/main/java/com/dk/mdm/model/response/ivt/OutboundResponse.java

@@ -60,7 +60,12 @@ public class OutboundResponse extends PageInfo<OutboundResponse> implements Seri
     @Excel(name = "可用量")
     @ApiModelProperty(value = "可用量")
     private BigDecimal usableQty;
-
+    /**
+     * 小数位数 ([0-6]能改大，不能改小)
+     */
+    @ApiModelProperty(value = "小数位数 ([0-6]能改大，不能改小)")
+    @TableField(exist = false)
+    private Integer decimalPlaces;
 
     @Excel(name = "包装")
     @ApiModelProperty(value = "包装")

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -48,9 +48,11 @@ import com.dk.mdm.model.vo.ivt.InboundItemVO;
 import com.dk.mdm.model.vo.ivt.InboundVO;
 import com.dk.mdm.model.vo.ivt.OutboundItemVO;
 import com.dk.mdm.model.vo.ivt.OutboundVO;
+import com.dk.mdm.model.vo.mac.RecPayVO;
 import com.dk.mdm.service.common.CommonService;
 import com.dk.mdm.service.ivt.inventory.InventoryService;
 import com.dk.mdm.service.mac.AccountService;
+import com.dk.mdm.service.mac.ReceiptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -122,6 +124,8 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
     @Autowired
     private InboundItemConvert inboundItemConvert;
 
+    @Autowired
+    private ReceiptService receiptService;
     /**
      * @desc : 删除外协品生产外协入库单
      * @date : 2024/5/10 10:31
@@ -463,6 +467,29 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
     }
 
     /**
+     * @desc : 销售出库新建>>>收款
+     * @date : 2024/3/7 14:13
+     * @author : 寇珊珊
+     */
+    @Transactional(rollbackFor = {Exception.class})
+    public ResponseResultVO<?> saleOrderOutboundInsertCollection(OutboundVO outboundVO) {
+        //新建销售出库
+        saleOrderOutboundInsert(outboundVO);
+        //新建退款
+        RecPayVO recPayVO = new RecPayVO();
+        recPayVO.setObjectId(outboundVO.getObjectId());
+        recPayVO.setOrgId(outboundVO.getOrgId());
+        recPayVO.setStaffId(outboundVO.getStaffId());
+        recPayVO.setAccDate(outboundVO.getAccDate());
+        recPayVO.setMakeStaff(outboundVO.getMakeStaff());
+        recPayVO.setRpType(outboundVO.getRpType());
+        recPayVO.setSumAmtRec(outboundVO.getSumAmtRec());
+        recPayVO.setItemList(outboundVO.getItemListRecPayItemVO());
+        receiptService.insertReceipt(recPayVO);
+        return ResponseResultUtil.success();
+    }
+
+    /**
      * @desc : 销售出库编辑
      * @date : 2024/3/25 16:25
      * @author : 寇珊珊