Merge remote-tracking branch 'origin/fencang' into fencang

api-admin/src/main/java/com/glxp/sale/admin/dao/inout/CodesTempDao.java

@@ -34,4 +34,5 @@ public interface CodesTempDao {
 
     List<WarehouseEntity> findByOrderIdAndCode(WarehouseQueryRequest warehouseQueryRequest);
 
+    void deleteByOrderId(String orderId);
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java

@@ -543,7 +543,7 @@ public class OrderServiceImpl implements OrderService {
                     }
 
                     //删除码
-                    codesDao.deleteByOrderId(id);
+                    codesTempDao.deleteByOrderId(id);
                 } catch (Exception e) {
                     throw new RuntimeException("删除单据失败");
                 }

api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml

@@ -184,4 +184,9 @@
         FROM io_codes_temp
         WHERE id = #{id}
     </delete>
+    <delete id="deleteByOrderId">
+        delete
+        from io_codes_temp
+        where orderId = #{orderId};
+    </delete>
 </mapper>