java110 2 年 前
コミット
db6fc0675a

java110-db/src/main/java/com/java110/db/BeanInitCostTimeBeanPostProcessor.java.txt → java110-db/src/main/java/com/java110/db/BeanInitCostTimeBeanPostProcessor.java


+ 7 - 1
java110-db/src/main/resources/mapper/store/StorehouseV1ServiceDaoImplMapper.xml

@@ -23,8 +23,14 @@
         shId,t.status_cd,t.status_cd statusCd,t.sh_name,t.sh_name shName,t.store_id,t.store_id
         storeId,t.is_show,t.is_show isShow,t.create_time createTime,t.purchase_switch purchaseSwitch,
         t.purchase_raf_id purchaseRafId,t.use_switch useSwitch,t.use_raf_id useRafId,
-        t.allocation_switch allocationSwitch,t.allocation_raf_id allocationRafId
+        t.allocation_switch allocationSwitch,t.allocation_raf_id allocationRafId,
+        raf.flow_name purchaseFlowName,
+        raf.flow_id purchaseFlowId,raf1.flow_id useFlowId,raf2.flow_id allocationFlowId,
+        raf1.flow_name useFlowName,raf2.flow_name allocationFlowName
         from storehouse t
+        left join resource_audit_flow raf on t.purchase_raf_id = raf.raf_id and raf.status_cd = '0'
+        left join resource_audit_flow raf1 on t.use_raf_id = raf1.raf_id and raf1.status_cd = '0'
+        left join resource_audit_flow raf2 on t.allocation_raf_id = raf2.raf_id and raf2.status_cd = '0'
         where 1 =1
         <if test="shDesc !=null and shDesc != ''">
             and t.sh_desc= #{shDesc}

+ 1 - 1
service-store/src/main/java/com/java110/store/cmd/purchase/PurchaseApplyCmd.java

@@ -97,7 +97,7 @@ public class PurchaseApplyCmd extends Cmd {
         List<StorehouseDto> storehouseDtos = storehouseV1InnerServiceSMOImpl.queryStorehouses(storehouseDto);
         Assert.listOnlyOne(storehouseDtos, "仓库不存在");
 
-        if (!StorehouseDto.SWITCH_ON.equals(storehouseDto.getPurchaseSwitch())) {
+        if (!StorehouseDto.SWITCH_ON.equals(storehouseDtos.get(0).getPurchaseSwitch())) {
             return;
         }
         String storeId = CmdContextUtils.getStoreId(context);

+ 0 - 16
springboot/src/main/java/com/java110/boot/BootApplicationStart.java

@@ -58,22 +58,6 @@ import java.util.concurrent.TimeUnit;
  * 这个服务是将 系统部署为spring boot版
  * 如果是spring cloud 微服务部署 不用启动这个类
  * <p>
- * excludeName = {
- * "com.java110.intf.acct",
- * "com.java110.intf.code",
- * "com.java110.intf.common",
- * "com.java110.intf.community",
- * "com.java110.intf.demo",
- * "com.java110.intf.dev",
- * "com.java110.intf.fee",
- * "com.java110.intf.goods",
- * "com.java110.intf.job",
- * "com.java110.intf.oa",
- * "com.java110.intf.order",
- * "com.java110.intf.report",
- * "com.java110.intf.store",
- * "com.java110.intf.user"
- * }
  *
  * @version v0.1
  * @auther com.java110.wuxw