Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/controller/ivt/inbound/InboundOtherController.java

@@ -22,7 +22,7 @@ import java.util.Map;
 @Api(tags = "其他入库单API接口")
 @RestController
 @RequestMapping("/ivt/inbound_other")
-public class InboundOtherController {
+public class    InboundOtherController {
 
     public BaseService<Inbound> getService() {
         return inboundOtherService;

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

@@ -496,7 +496,6 @@
         left join dkic_b.t_mst_dictionary_data tmd on tmd.data_id = tpi.into_reason
         left join dkic_b.t_mac_account_item tmai on tmai.item_id = tpi.receivable_id
         WHERE tpi.into_id = #{id}::uuid
-        and tpi.flg_valid
     </select>
 
     <!-- 根据主键锁定表t_psi_inbound的一行数据 -->

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

@@ -545,6 +545,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                 ,t.outing_piece
                 ,t.out_box
                 ,t.out_piece
+                ,t.out_status
         FROM dkic_b.t_psi_outbound_item as t
                  left join dkic_b.t_mst_unit as tmgu on t.unit_id = tmgu.unit_id
                  left join dkic_b.t_mst_unit as tmgus on t.sub_unit_id = tmgus.unit_id

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

@@ -337,6 +337,9 @@
             <if test="viewVoidedDocuments !=null and viewVoidedDocuments == false">
                 AND  t.flg_valid = true
             </if>
+            <if test="flgValid != null">
+                AND t.flg_valid = #{flgValid}
+            </if>
         </where>
     </sql>
 
@@ -733,7 +736,7 @@
         tpi.intoing_amt as outing_amt ,
         sys.f_remove_zero(tpi.into_qty)   as out_qty ,
         tpi.into_amt as out_amt,
-        sys.f_remove_zero(tpi.return_qty) as  tpi.return_qty,
+        sys.f_remove_zero(tpi.return_qty) as  return_qty,
         tpi.return_amt,
         tpi.into_date as out_date,
         tpi.remarks,

src/main/java/com/dk/mdm/mapper/mac/AccountItemMapper.xml

@@ -180,7 +180,7 @@
     <select id="getReceivableAccountSum" resultType="Map">
         SELECT SUM
         ( CASE WHEN tmai.acc_item_type = '账款类型-应收' THEN tmai.amt_should ELSE 0 END ) AS receivable,
-        SUM ( CASE WHEN tmai.acc_item_type = '账款类型-收款' THEN tmai.amt_should ELSE 0 END ) AS receipt
+        SUM ( CASE WHEN tmai.acc_item_type = '账款类型-收款' THEN tmai.amt_rec ELSE 0 END ) AS receipt
         FROM
         dkic_b.t_mac_account_item tmai
         WHERE

src/main/java/com/dk/mdm/model/query/ivt/InboundQuery.java

@@ -192,6 +192,9 @@ public class InboundQuery extends PageInfo<InboundQuery>{
     @TableField(typeHandler = UuidListTypeHandler.class)
     private List<String> intoReasonList;
 
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private List<Boolean> flgValidList;
+
 
     @ApiModelProperty(value = "入库时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -545,7 +545,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
      * @date : 2024/3/1 9:20
      */
     public ResponseResultVO<List<Map<String, Object>>> getGoodsBrandListNoPage(Map<String, Object> param) {
-        // 获取公司
+        // 有效的品牌 230529
+        param.put("flgValid",true);
         List<Map<String, Object>> list = commonMapper.getGoodsBrand(param);
         return ResponseResultUtil.success(list);
     }

src/main/java/com/dk/mdm/service/ivt/inbound/InboundOtherService.java

@@ -466,19 +466,19 @@ public class InboundOtherService extends BaseService<Inbound> {
                 //region 将库存需要的参数赋值
                 inboundItemResponse.setInventoryType(Constant.InventoryType.INBOUND.getName());
                 inboundItemResponse.setInventoryDocCode(Constant.InventoryDocCode.OTHER_INBOUND.getValue());
-                inboundItemResponse.setIntoQty(inboundItemResponse.getIntoQty().negate());
-                inboundItemResponse.setIntoAmt(inboundItemResponse.getIntoAmt().negate());
+                inboundItemResponse.setIntoQty(inboundItemResponse.getIntoQty());
+                inboundItemResponse.setIntoAmt(inboundItemResponse.getIntoAmt());
                 //endregion
 
-                //赋值
-                InboundItem inboundItem = new InboundItem();
-                inboundItem.setItemId(inboundItemResponse.getItemId());
-                inboundItem.setFlgValid(false);
-                //修改
-                inboundItemMapper.update(inboundItem,
-                        new UpdateWrapper<InboundItem>().lambda()
-                                .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
-                );
+                //赋值 赋值明细  防止作废的单据查不到明细 故注掉下面代码
+//                InboundItem inboundItem = new InboundItem();
+//                inboundItem.setItemId(inboundItemResponse.getItemId());
+//                inboundItem.setFlgValid(false);
+//                //修改
+//                inboundItemMapper.update(inboundItem,
+//                        new UpdateWrapper<InboundItem>().lambda()
+//                                .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
+//                );
             }
             //endregion
 
@@ -511,7 +511,7 @@ public class InboundOtherService extends BaseService<Inbound> {
                 inboundItem.setItemId(inboundItemResponse.getItemId());
                 inboundItem.setIntoingQty(BigDecimal.ZERO);
                 inboundItem.setIntoingAmt(BigDecimal.ZERO);
-                inboundItem.setFlgValid(false);
+//                inboundItem.setFlgValid(false);
                 //修改
                 inboundItemMapper.update(inboundItem,
                         new UpdateWrapper<InboundItem>().lambda()

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseReturnService.java

@@ -520,15 +520,15 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                 inboundItemResponse.setIntoAmt(inboundItemResponse.getIntoAmt().negate());
                 //endregion
 
-                //赋值
-                InboundItem inboundItem = new InboundItem();
-                inboundItem.setItemId(inboundItemResponse.getItemId());
-                inboundItem.setFlgValid(false);
-                //修改
-                inboundItemMapper.update(inboundItem,
-                        new UpdateWrapper<InboundItem>().lambda()
-                                .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
-                );
+                //赋值 赋值明细  防止作废的单据查不到明细 故注掉下面代码
+//                InboundItem inboundItem = new InboundItem();
+//                inboundItem.setItemId(inboundItemResponse.getItemId());
+//                inboundItem.setFlgValid(false);
+//                //修改
+//                inboundItemMapper.update(inboundItem,
+//                        new UpdateWrapper<InboundItem>().lambda()
+//                                .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
+//                );
             }
             //endregion
 
@@ -567,7 +567,7 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                 inboundItem.setItemId(inboundItemResponse.getItemId());
                 inboundItem.setIntoingQty(BigDecimal.ZERO);
                 inboundItem.setIntoingAmt(BigDecimal.ZERO);
-                inboundItem.setFlgValid(false);
+//                inboundItem.setFlgValid(false);
                 //修改
                 inboundItemMapper.update(inboundItem,
                         new UpdateWrapper<InboundItem>().lambda()

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseService.java

@@ -719,15 +719,15 @@ public class InboundPurchaseService extends BaseService<Inbound> {
                 inboundItemResponse.setIntoAmt(inboundItemResponse.getIntoAmt().negate());
                 //endregion
 
-                //region  编辑明细  赋值
-                InboundItem inboundItem = new InboundItem();
-                inboundItem.setItemId(inboundItemResponse.getItemId());
-                inboundItem.setFlgValid(false);
-                //修改
-                inboundItemMapper.update(inboundItem,
-                        new UpdateWrapper<InboundItem>().lambda()
-                                .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
-                );
+                //region  编辑明细  赋值 赋值明细  防止作废的单据查不到明细 故注掉下面代码
+//                InboundItem inboundItem = new InboundItem();
+//                inboundItem.setItemId(inboundItemResponse.getItemId());
+//                inboundItem.setFlgValid(false);
+//                //修改
+//                inboundItemMapper.update(inboundItem,
+//                        new UpdateWrapper<InboundItem>().lambda()
+//                                .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
+//                );
                 //endregion
 
                 //region  销售明细
@@ -807,7 +807,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
                 inboundItem.setItemId(inboundItemResponse.getItemId());
                 inboundItem.setIntoingQty(BigDecimal.ZERO);
                 inboundItem.setIntoingAmt(BigDecimal.ZERO);
-                inboundItem.setFlgValid(false);
+//                inboundItem.setFlgValid(false);
                 //修改
                 inboundItemMapper.update(inboundItem,
                         new UpdateWrapper<InboundItem>().lambda()

src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java

@@ -1122,7 +1122,7 @@ public class InventoryService extends BaseService<Inventory> {
                     throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_BATCH_DOES_NOT_EXIST.getMessage());
                 } else {
                     //数据库中库存批次数量和传入数量一致 可以更改
-                    if (inventoryResponse.getInvQty().compareTo(inOutRecordVO.getIntoQty().abs()) == 0) {
+                    if (inventoryBatchResponse.getInvQty().compareTo(inOutRecordVO.getIntoQty().abs()) == 0) {
                         InventoryBatch inventoryBatch = new InventoryBatch();
                         //来源单ID
                         inventoryBatch.setFromId(inOutRecordVO.getBiznisId());

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

@@ -473,15 +473,15 @@ public class OutboundOtherService extends BaseService<Outbound> {
                 outboundItemResponse.setOutAmt(outboundItemResponse.getOutAmt().negate());
                 //endregion
 
-                //赋值
-                OutboundItem outboundItem = new OutboundItem();
-                outboundItem.setItemId(outboundItemResponse.getItemId());
-                outboundItem.setFlgValid(false);
-                //修改
-                outboundItemMapper.update(outboundItem,
-                        new UpdateWrapper<OutboundItem>().lambda()
-                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
-                );
+                //赋值   防止作废的单据查不到明细 故注掉下面代码
+//                OutboundItem outboundItem = new OutboundItem();
+//                outboundItem.setItemId(outboundItemResponse.getItemId());
+//                outboundItem.setFlgValid(false);
+//                //修改
+//                outboundItemMapper.update(outboundItem,
+//                        new UpdateWrapper<OutboundItem>().lambda()
+//                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
+//                );
             }
             //endregion
 
@@ -513,7 +513,7 @@ public class OutboundOtherService extends BaseService<Outbound> {
                 outboundItem.setItemId(outboundItemResponse.getItemId());
                 outboundItem.setOutingQty(BigDecimal.ZERO);
                 outboundItem.setOutingAmt(BigDecimal.ZERO);
-                outboundItem.setFlgValid(false);
+//                outboundItem.setFlgValid(false);
                 //修改
                 outboundItemMapper.update(outboundItem,
                         new UpdateWrapper<OutboundItem>().lambda()

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

@@ -918,15 +918,15 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 outboundItemResponse.setOutAmt(outboundItemResponse.getOutAmt().negate());
                 //endregion
 
-                //赋值
-                OutboundItem outboundItem = new OutboundItem();
-                outboundItem.setItemId(outboundItemResponse.getItemId());
-                outboundItem.setFlgValid(false);
-                //修改
-                outboundItemMapper.update(outboundItem,
-                        new UpdateWrapper<OutboundItem>().lambda()
-                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
-                );
+                //赋值  防止作废的单据查不到明细 故注掉下面代码
+//                OutboundItem outboundItem = new OutboundItem();
+//                outboundItem.setItemId(outboundItemResponse.getItemId());
+//                outboundItem.setFlgValid(false);
+//                //修改
+//                outboundItemMapper.update(outboundItem,
+//                        new UpdateWrapper<OutboundItem>().lambda()
+//                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
+//                );
 
                 //region  销售明细
                 if (outboundItemResponse.getFromItemId() != null) {
@@ -1015,7 +1015,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 outboundItem.setItemId(outboundItemResponse.getItemId());
                 outboundItem.setOutingQty(BigDecimal.ZERO);
                 outboundItem.setOutingAmt(BigDecimal.ZERO);
-                outboundItem.setFlgValid(false);
+//                outboundItem.setFlgValid(false);
                 //修改
                 outboundItemMapper.update(outboundItem,
                         new UpdateWrapper<OutboundItem>().lambda()

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

@@ -760,15 +760,15 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                 outboundItemResponse.setOutAmt(outboundItemResponse.getOutAmt().negate());
                 //endregion
 
-                //region 赋值明细
-                OutboundItem outboundItem = new OutboundItem();
-                outboundItem.setItemId(outboundItemResponse.getItemId());
-                outboundItem.setFlgValid(false);
-                //修改
-                outboundItemMapper.update(outboundItem,
-                        new UpdateWrapper<OutboundItem>().lambda()
-                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
-                );
+//                //region 赋值明细  防止作废的单据查不到明细 故注掉下面代码
+//                OutboundItem outboundItem = new OutboundItem();
+//                outboundItem.setItemId(outboundItemResponse.getItemId());
+//                outboundItem.setFlgValid(false);
+//                //修改
+//                outboundItemMapper.update(outboundItem,
+//                        new UpdateWrapper<OutboundItem>().lambda()
+//                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
+//                );
                 //endregion
             }
             //endregion
@@ -808,7 +808,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                 outboundItem.setItemId(outboundItemResponse.getItemId());
                 outboundItem.setOutingQty(BigDecimal.ZERO);
                 outboundItem.setOutingAmt(BigDecimal.ZERO);
-                outboundItem.setFlgValid(false);
+//                outboundItem.setFlgValid(false);
                 //修改
                 outboundItemMapper.update(outboundItem,
                         new UpdateWrapper<OutboundItem>().lambda()