diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
index 5a357dc3..024a6a78 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
@@ -574,6 +574,11 @@ public class WareHouseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
AddCodeResult addCodeResult = new AddCodeResult();
+
+ if (addOrderRequest.getAction() == null) {
+ addOrderRequest.setAction(addOrderRequest.getBillType());
+ }
+
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getAction());
String code = addOrderRequest.getCode();
if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreProductDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreProductDetailDao.java
index fd1950e5..03df4ae9 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreProductDetailDao.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreProductDetailDao.java
@@ -26,4 +26,13 @@ public interface InvPreProductDetailDao {
boolean deleteByProductId(FilterInvProductDetailRequest filterInvProductDetailRequest);
int statCount(FilterInvProductDetailRequest filterInvProductDetailRequest);
+
+
+ /**
+ * 根据orderId删除预验收库存详情
+ *
+ * @param orderIdFk 扫码单据ID
+ */
+ boolean deleteByOrderId(String orderIdFk);
+
}
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml
index 0964a297..d9bd943a 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml
@@ -289,4 +289,13 @@
+
+
+ delete
+ from inv_product_detail
+ where orderIdFk = #{orderIdFk}
+
+
+
+
\ No newline at end of file
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml
index a79fdada..b0477125 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml
@@ -230,4 +230,13 @@
+
+
+
+ delete
+ from inv_product_detail
+ where orderIdFk = #{orderIdFk}
+
+
+
\ No newline at end of file