订到到销售出库编辑 订单明细编辑修改

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.java

@@ -104,5 +104,14 @@ public interface OrderItemMapper extends BaseMapper<OrderItem> {
      * @author : 寇珊珊
      */
     Long selectBySaleOutByCound(OrderItemQuery orderItemQuery);
+
+    /**
+     * @desc   : 修改退货信息
+     * @date   : 2024/3/29 9:05
+     * @author : 寇珊珊
+     */
+    int  updateOutMessage(OrderItem orderItem);
+
+
 }
 

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

@@ -546,7 +546,16 @@
             </if>
         </set>
         where item_id = #{et.itemId,typeHandler=UuidTypeHandler}
-        and item_qty >=(out_qty + outing_qty)
+        and item_qty >=(
+        out_qty
+        <if test=" et!=null and et.updateOutMessageFlag != null and et.updateOutMessageFlag ">
+            + #{et.outQty,jdbcType=NUMERIC}
+        </if>
+        + outing_qty
+        <if test=" et!=null and et.updateOutingMessageFlag != null and et.updateOutingMessageFlag ">
+            + #{et.outingQty,jdbcType=NUMERIC}
+        </if>
+        )
     </update>
 
     <!--修改退货信息 -->

src/main/java/com/dk/mdm/model/pojo/sale/OrderItem.java

@@ -300,6 +300,15 @@ public class OrderItem extends PageInfo<OrderItem> implements Serializable {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String supId;
 
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "订单编辑已出库出库单信息标识 true走特殊处理，false不走特殊处理")
+    private Boolean updateOutMessageFlag;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "订单编辑出库中出库单信息标识 true走特殊处理，false不走特殊处理")
+    private Boolean updateOutingMessageFlag;
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -783,7 +783,8 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                         orderItem.setOutQty((outboundItemResponse != null ? outboundItemResponse.getOutQty().negate() : BigDecimal.ZERO).add(outboundItemVO.getOutQty()));
                         orderItem.setOutAmt((outboundItemResponse != null ? outboundItemResponse.getOutAmt().negate() : BigDecimal.ZERO).add(outboundItemVO.getOutAmt()));
                         orderItem.setOutingQty((outboundItemResponse != null && outboundItemResponse.getOutingQty().compareTo(BigDecimal.ZERO) > 0) ? outboundItemVO.getOutQty().negate() : BigDecimal.ZERO);
-                        orderItem.setOutingQty((outboundItemResponse != null && outboundItemResponse.getOutingAmt().compareTo(BigDecimal.ZERO) > 0) ? outboundItemVO.getOutAmt().negate() : BigDecimal.ZERO);
+                        orderItem.setOutingAmt((outboundItemResponse != null && outboundItemResponse.getOutingAmt().compareTo(BigDecimal.ZERO) > 0) ? outboundItemVO.getOutAmt().negate() : BigDecimal.ZERO);
+                        orderItem.setUpdateOutMessageFlag(true);
                         //出库状态
                         String outStatus = this.setOutStatus(orderItemResponse.getOutingQty().add(orderItem.getOutingQty()),
                                 orderItemResponse.getOutQty().add(orderItem.getOutQty()), orderItemResponse.getItemQty());
@@ -954,6 +955,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                         orderItem.setItemId(outboundItemVO.getFromItemId());
                         orderItem.setOutingQty(( outboundItemResponse != null ? outboundItemResponse.getOutingQty().negate() : BigDecimal.ZERO).add(outboundItemVO.getOutingQty()));
                         orderItem.setOutingAmt(( outboundItemResponse != null ? outboundItemResponse.getOutingAmt().negate() : BigDecimal.ZERO).add(outboundItemVO.getOutingAmt()));
+                        orderItem.setUpdateOutingMessageFlag(true);
                         //出库状态
                         String outStatus = this.setOutStatus(orderItemResponse.getOutingQty().add(orderItem.getOutingQty()),
                                 orderItemResponse.getOutQty(), orderItemResponse.getItemQty());