配送明细客户id值;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java

@@ -293,6 +293,9 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
             reservationDeliveryDetailsLink.setAmount(customerDeliveryDetail.getAmount());
             reservationDeliveryDetailsLink.setCustomerNumber(customerDeliveryDetail.getCustomerCode());
             reservationDeliveryDetailsLink.setDeliveryName(customerDeliveryDetail.getCustomerName());
+            String customerCode = customerDeliveryDetail.getCustomerCode();
+            Long userId = stockOutOrderMapper.queryShipperId(customerCode, loginUser.getUserPo().getOrganizationId());
+            reservationDeliveryDetailsLink.setCustomerId(userId);
             reservationDeliveryDetailsLink.setBox(customerDeliveryDetail.getBoxCount());
             reservationDeliveryDetailsLink.setBag(customerDeliveryDetail.getPackageCount());
             reservationDeliveryDetailsLink.setCategory(customerDeliveryDetail.getCategory());

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java

@@ -234,10 +234,6 @@ public class ReservationStockInOrderApplicationService {
             if (stockInOrderPO == null) {
                 throw new ServiceException("入库单不存在，入库单ID：" + inOrderId);
             }
-            // 只有已创建状态（status = 1）的入库单可以删除
-            if (stockInOrderPO.getStatus() == null || !stockInOrderPO.getStatus().equals(1)) {
-                throw new ServiceException("只有已创建状态的入库单可以删除，入库单号：" + stockInOrderPO.getInOrderNumber() + "，当前状态：" + getStatusName(stockInOrderPO.getStatus()));
-            }
         }
 
         return stockInOrderDomainService.delete(inOrderIds);

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/mapper/ReservationStockOutOrderMapper.java

@@ -6,6 +6,7 @@ import com.mhd.oms.domain.reservationOutMaterialDetail.repository.po.Reservation
 import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder;
 import com.mhd.oms.domain.reservationStockOutOrder.repository.po.ReservationStockOutOrderPO;
 import com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationStockOutOrderDO;
+import org.apache.ibatis.annotations.Param;
 //import com.mhd.wms.domain.stockOutOrder.entity.ReservationStockOutOrder;
 //import com.mhd.wms.domain.stockOutOrder.repository.po.ReservationStockOutOrderPO;
 //import com.mhd.wms.domain.stockOutOrder.repository.todo.ReservationStockOutOrderDO;
@@ -34,4 +35,6 @@ public interface ReservationStockOutOrderMapper extends BaseMapper<ReservationSt
      * 出库单提货单打印-明细
      */
     List<ReservationOutMaterialDetailPO> queryOutStockNoticePrintDetail(ReservationStockOutOrderDO stockOutOrderDO);
+
+    Long queryShipperId(@Param("userMemberCode") String userMemberCode,@Param("organizationId") Long organizationId);
 }

mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml

@@ -466,4 +466,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="boxPalletNo" column="box_pallet_no"/>
     </resultMap>
 
+    <select id="queryShipperId" resultType="java.lang.Long">
+        select max(user_id) as user_id from NGWL_TEST_USER."USER" where ORGANIZATION_ID = #{organizationId} and USER_MEMBER_CODE = #{userMemberCode} and DEL_FLAG = 1
+    </select>
+
 </mapper>