diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
index 34dc4e0..971298d 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
@@ -581,6 +581,9 @@ 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/sale/admin/dao/inventory/InvPreProductDetailDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreProductDetailDao.java
index fecf709..0a29d3e 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreProductDetailDao.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreProductDetailDao.java
@@ -26,4 +26,12 @@ 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 98f0127..b75f91c 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml
@@ -295,4 +295,12 @@
+
+
+
+ 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 f132688..3f1e378 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml
@@ -232,4 +232,13 @@
+
+
+
+
+ delete
+ from inv_product_detail
+ where orderIdFk = #{orderIdFk}
+
+
\ No newline at end of file