Merge branch 'feat/mes' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17

yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImplTest.java

@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.mes.enums.wm.MesWmOutsourceReceiptStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
 import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
@@ -49,6 +50,8 @@ public class MesWmOutsourceReceiptServiceImplTest extends BaseDbUnitTest {
     private MesMdVendorService vendorService;
     @MockitoBean
     private MesMdItemService itemService;
+    @MockitoBean
+    private MesProWorkOrderService workOrderService;
 
     @Test
     public void testUpdateOutsourceReceiptWhenIqcFinish_success_bothQualifiedAndUnqualified() {

yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImplTest.java

@@ -11,6 +11,7 @@ import org.springframework.context.annotation.Import;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
 
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
@@ -39,6 +40,8 @@ public class MesWmProductSalesLineServiceImplTest extends BaseDbUnitTest {
 
     @MockitoBean
     private MesMdItemService itemService;
+    @MockitoBean
+    private MesWmBatchService batchService;
 
     @Test
     public void testUpdateProductSalesLineWhenOqcFinish_pass() {

yudao-module-mes/src/test/resources/sql/create_tables.sql

@@ -390,6 +390,7 @@ CREATE TABLE IF NOT EXISTS "mes_wm_product_sales_line" (
     "item_id" bigint NOT NULL,
     "quantity" decimal(20,6) NOT NULL,
     "batch_id" bigint DEFAULT NULL,
+    "batch_code" varchar(255) DEFAULT NULL,
     "material_stock_id" bigint DEFAULT NULL,
     "oqc_check_flag" tinyint DEFAULT NULL,
     "oqc_id" bigint DEFAULT NULL,