Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -1073,7 +1073,7 @@
             AND tmgs.sku_name LIKE concat('%',my_ex.likequery(#{skuName}),'%')
         </if>
         <if test="whName != null">
-            AND tmgs.wh_name LIKE concat('%',my_ex.likequery(#{whName}),'%')
+            AND tmw.wh_name LIKE concat('%',my_ex.likequery(#{whName}),'%')
         </if>
         <if test="whId != null">
             AND tpi.wh_id = #{whId} ::uuid

src/main/java/com/dk/mdm/model/vo/ivt/InOutRecordVO.java

@@ -219,6 +219,9 @@ public class InOutRecordVO  {
     private Integer itemIndex;
 
 
+    @ApiModelProperty(value = "存货批次明细ID")
+    private String batchId;
+
 
 
 

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

@@ -574,11 +574,11 @@ public class InventoryService extends BaseService<Inventory> {
                     this.insertInboundRecord(inOutRecordVO);
                     //endregion
 
-                    //region 采购退货 出库成本 正数
-                    if (Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
-                        this.insertOutboundItemCost(inOutRecordVO);
-                    }
-                    //endregion
+//                    //region 采购退货 出库成本 正数
+//                    if (Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
+//                        this.insertOutboundItemCost(inOutRecordVO);
+//                    }
+//                    //endregion
                 }
                 //endregion
             }
@@ -630,11 +630,10 @@ public class InventoryService extends BaseService<Inventory> {
                     if (inOutRecordVO.getSOutItemId() != null) {
                         List<OutboundItemCostResponse> outboundItemCostResponses = outboundItemCostMapper.selectByCond(new OutboundItemCostQuery().setOutItemId(inOutRecordVO.getSOutItemId()));
                         if (outboundItemCostResponses.size() > 0) {
-                            //出库单价
+                            //出库单价  反写出库单成本单价、成本金额
                             inOutRecordVO.setPriceInto(outboundItemCostResponses.get(0).getCostPrice());
                             //金额
                             inOutRecordVO.setIntoAmt(outboundItemCostResponses.get(0).getCostPrice().multiply(inOutRecordVO.getIntoQty()).abs());
-                            //反写出库单成本单价、成本金额
 
                         } else {
                             //当前销售退货单无法获取源出库单数据
@@ -664,12 +663,12 @@ public class InventoryService extends BaseService<Inventory> {
                     this.insertInboundRecord(inOutRecordVO);
                     //endregion
 
-                    //region  出库成本
-                    //除了销售退货出库  其他类型出库要新建出库成本
-                    if (!Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
-                        this.insertOutboundItemCost(inOutRecordVO);
-                    }
-                    //endregion
+//                    //region 销售退货 其他类型出库
+//                    if (!Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
+//                        this.insertOutboundItemCost(inOutRecordVO);
+//                    }
+//                    //endregion
+
                 }
                 //endregion
 
@@ -983,8 +982,9 @@ public class InventoryService extends BaseService<Inventory> {
                 outboundItemCost.setCostAmt(inOutRecordVO.getIntoAmt());
             }
         }
-        Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.OUTBOUNDCOST.getName(), false);
-        outboundItemCost.setBatchId(codeMap.get("outId").toString());
+        /*Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.OUTBOUNDCOST.getName(), false);
+        outboundItemCost.setBatchId(codeMap.get("outId").toString());*/
+        outboundItemCost.setBatchId(inOutRecordVO.getBatchId());
         //新建
         outboundItemCostMapper.insert(outboundItemCost);
     }
@@ -1032,7 +1032,7 @@ public class InventoryService extends BaseService<Inventory> {
                         //主键赋值
                         inventoryBatchVO.setBatchId(inventoryBatchResponse.getBatchId());
                         //库存数量
-                        inventoryBatchVO.setInvQty(inOutRecordVO.getIntoQty());
+                        inventoryBatchVO.setInvQty(qty.abs());
                         //存货资产
                         inventoryBatchVO.setCostAmt(inventoryBatchVO.getInvQty().multiply(inventoryBatchResponse.getCostPrice()));
                         //清零标识
@@ -1068,6 +1068,16 @@ public class InventoryService extends BaseService<Inventory> {
                         inOutRecordVO.setIntoAmt(inOutRecordVO.getIntoQty().multiply(inventoryBatchResponse.getCostPrice()));
                     }
                 }
+                //todo  2024年5月20日15:46:01  库存批次有几条出库成本就有几条
+                //region  出库成本
+                //除了销售退货出库  其他类型出库要新建出库成本  采购退货 出库成本 正数
+                if (!Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode()) ||
+                        Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
+                    //存货批次明细ID
+                    inOutRecordVO.setBatchId(inventoryBatchResponse.getBatchId());
+                    this.insertOutboundItemCost(inOutRecordVO);
+                }
+                //endregion
             }
         } else {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.CAN_OUTBOUND_QUANTITY_INSUFFICIENT.getMessage());
@@ -1420,6 +1430,7 @@ public class InventoryService extends BaseService<Inventory> {
 
                 //新建存货流水 一正一负
                 this.insertInboundRecord(inOutRecordVO);
+
                 //新建出库成本
                 this.insertOutboundItemCost(inOutRecordVO);
             }

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

@@ -1,5 +1,6 @@
 package com.dk.mdm.service.mst;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.dk.common.exception.BaseBusinessException;
 import com.dk.common.infrastructure.annotaiton.Pagination;
@@ -12,6 +13,7 @@ import com.dk.common.model.vo.core.StaffEntity;
 import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
+import com.dk.common.util.AESUtil;
 import com.dk.mdm.feign.CompanyFeign;
 import com.dk.mdm.feign.UserFeign;
 import com.dk.mdm.infrastructure.convert.mst.StaffConvert;
@@ -127,6 +129,16 @@ public class StaffService extends BaseService<Staff> {
             Integer cpId = authUtils.getStaff().getCpId();
             staffQuery.setCpId(cpId);
         }
+//        Map<String,Object> map = new HashMap<>();
+//        map.put("grade_code","STD");
+//        map.put("end_date","2099-09-01");
+//        map.put("web_max_num",1);
+//        map.put("wx_max_num",1);
+//        String s1 = JSON.toJSONString(map);
+//        // 加密
+//        String s = AESUtil.aesEncrypt(s1);
+//        // 解密
+//        Map<String,Object> ss = JSON.parseObject(AESUtil.desEncrypt(s),Map.class) ;
         return super.mergeListWithCount(staffQuery, staffMapper.selectByCond(staffQuery),
                 staffMapper.countByCond(staffQuery));
     }