修改出库bug

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

@@ -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 {
                             //当前销售退货单无法获取源出库单数据
@@ -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()));
                         //清零标识