Просмотр исходного кода

不关联源单提示语修改

于继渤 1 год назад
Родитель
Сommit
4f7fc82fa3

+ 3 - 0
src/main/java/com/dk/mdm/mapper/ivt/InboundMapper.xml

@@ -182,6 +182,7 @@
         <result column="sku_code" property="skuCode"/>
         <result column="sku_code" property="skuCode"/>
         <result column="sku_name" property="skuName"/>
         <result column="sku_name" property="skuName"/>
         <result column="sku_model" property="skuModel"/>
         <result column="sku_model" property="skuModel"/>
+        <result column="short_name" property="shortName"/>
         <result column="price_purchase" property="pricePurchase"/>
         <result column="price_purchase" property="pricePurchase"/>
         <result column="reject_qty" property="rejectQty"/>
         <result column="reject_qty" property="rejectQty"/>
         <result column="sku_images" property="skuImages"  typeHandler="JsonTypeHandler"/>
         <result column="sku_images" property="skuImages"  typeHandler="JsonTypeHandler"/>
@@ -603,6 +604,7 @@
         tmgs.sku_code AS  list_sku_code,
         tmgs.sku_code AS  list_sku_code,
         tmgs.sku_name AS  list_sku_name,
         tmgs.sku_name AS  list_sku_name,
         tmgs.sku_model AS  list_sku_model,
         tmgs.sku_model AS  list_sku_model,
+        tmgb.short_name AS  list_short_name,
         tmgs.price_purchase AS  list_price_purchase,
         tmgs.price_purchase AS  list_price_purchase,
         tmgs.sku_images AS  list_sku_images,
         tmgs.sku_images AS  list_sku_images,
 
 
@@ -630,6 +632,7 @@
         left  join dkic_b.t_psi_inbound_item tpii  on tpi.into_id = tpii.into_id and  ( tpii.into_qty - tpii.return_qty) > 0
         left  join dkic_b.t_psi_inbound_item tpii  on tpi.into_id = tpii.into_id and  ( tpii.into_qty - tpii.return_qty) > 0
         left  join  dkic_b.t_mst_warehouse tmw on  tmw.wh_id =   tpii.wh_id
         left  join  dkic_b.t_mst_warehouse tmw on  tmw.wh_id =   tpii.wh_id
         inner join  dkic_b.t_mst_goods_sku  tmgs on tmgs.sku_id = tpii.sku_id
         inner join  dkic_b.t_mst_goods_sku  tmgs on tmgs.sku_id = tpii.sku_id
+        left join  dkic_b.t_mst_goods_brand  tmgb on tmgb.brand_id = tmgs.brand_id
         left join(SELECT T.*
         left join(SELECT T.*
         FROM (select tpi.inv_id,
         FROM (select tpi.inv_id,
         tpi.wh_id,
         tpi.wh_id,

+ 0 - 7
src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseReturnService.java

@@ -620,13 +620,6 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
 
 
         //region 编辑明细
         //region 编辑明细
         for (InboundItemVO inboundItemVO : inboundVO.getItemList()) {
         for (InboundItemVO inboundItemVO : inboundVO.getItemList()) {
-            //region  不能新建
-            if (inboundItemVO.getSPurItemId() == null) {
-                throw new BaseBusinessException(ErrorCodeEnum.ITEMS_THAT_ARE_NOT_AVAILABLE_HANDLE.getCode(),
-                        ErrorCodeEnum.ITEMS_THAT_ARE_NOT_AVAILABLE_HANDLE.getMessage());
-            }
-            //endregion
-
             //查询原单
             //查询原单
             InboundItemResponse inboundItemResponse = inboundItemMapper.selectById(inboundItemVO.getItemId());
             InboundItemResponse inboundItemResponse = inboundItemMapper.selectById(inboundItemVO.getItemId());
             //region 校验数量是否超出
             //region 校验数量是否超出