Merge remote-tracking branch 'origin/master'

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingAssortmentController.java

@@ -99,7 +99,8 @@ public class PlatingAssortmentController extends BladeController {
         QueryWrapper<PlatingAssortment> qw = Condition.getQueryWrapper(platingAssortment, PlatingAssortment.class);
         // 添加未删除的条件
         qw.eq("IS_DELETED", CommonConstant.DELETE_FALSE);
-        
+        qw.orderByAsc("NAME");
+
         IPage<PlatingAssortment> pages = service.page(Condition.getPage(query), qw);
         IPage<PlatingAssortmentVO> pagesVO = PlatingAssortmentWrapper.build().pageVO(pages);
         pagesVO.getRecords().stream()

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGlassCakeOutMapper.xml

@@ -41,7 +41,7 @@
         gco.part_name, gco.batch_code, gco.card_no, gco.quantity, gco.require_qty,
         gco.stove_pi_no, gco.out_qty, gco.cur_status, gco.est_use_time, gco.out_time,
         gco.out_users, gco.out_code,
-        gco.memo, gco.picker,
+        gco.memo, gco.picker, gco.pre_out_qty,
             -- 物料表字段（根据实际ST_GOODS字段调整，无则删对应行）
             g.goods_code,
             g.id AS goodsId,

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGraphiteMoldOutMapper.xml

@@ -35,6 +35,7 @@
         gmo.sir_id, gmo.yo_code, gmo.pi_no,
         gmo.card_no, gmo.need_quantity, gmo.outed_quantity,
         gmo.cur_status, gmo.out_time, gmo.out_user, gmo.out_code, gmo.picker,
+        gmo.parent_out_code, gmo.complete_quantity,
         -- 物料表字段
         g.goods_code,
         g.id AS goodsId,