每日面料使用

bladex-tool/blade-starter-mybatis/pom.xml

@@ -60,10 +60,10 @@
             <artifactId>blade-core-auto</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-boot-starter</artifactId>-->
+<!--        </dependency>-->
     </dependencies>
 
 </project>

bladex-tool/blade-starter-mybatis/src/main/java/org/springblade/core/mp/config/MybatisPlusConfiguration.java

@@ -16,10 +16,8 @@
  */
 package org.springblade.core.mp.config;
 
-import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
-import com.baomidou.mybatisplus.extension.MybatisMapWrapperFactory;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
@@ -158,10 +156,10 @@ public class MybatisPlusConfiguration implements WebMvcConfigurer {
      * updateTime 2022-08-10
      * </p>
      */
-    @Bean
-    public ConfigurationCustomizer configurationCustomizer() {
-        return i -> i.setObjectWrapperFactory(new MybatisMapWrapperFactory());
-    }
+//    @Bean
+//    public ConfigurationCustomizer configurationCustomizer() {
+//        return i -> i.setObjectWrapperFactory(new MybatisMapWrapperFactory());
+//    }
 
 }
 

bladex/blade-auth/pom.xml

@@ -85,11 +85,11 @@
             <groupId>com.github.whvcse</groupId>
             <artifactId>easy-captcha</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>common-tool</artifactId>
-            <version>3.2.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.fjhx</groupId>-->
+<!--            <artifactId>common-tool</artifactId>-->
+<!--            <version>3.2.0</version>-->
+<!--        </dependency>-->
         <!-- 链路追踪、服务监控 -->
         <!--<dependency>
             <groupId>org.springblade</groupId>

bladex/blade-auth/src/main/java/org/springblade/auth/constant/WxAppletConstant.java

@@ -0,0 +1,8 @@
+package org.springblade.auth.constant;
+
+public interface WxAppletConstant {
+
+    String STORAGE_APPID = "wxe4a17c2bc0287527";
+    String STORAGE_SECRET = "5129449cda3bb2232cde6f17f28549eb";
+
+}

bladex/blade-auth/src/main/java/org/springblade/auth/granter/CaptchaTokenGranter.java

@@ -1,9 +1,9 @@
 package org.springblade.auth.granter;
 
-import com.fjhx.constants.WxAppletConstant;
-import com.fjhx.utils.WxAppletUtil;
+import org.springblade.auth.constant.WxAppletConstant;
 import org.springblade.auth.service.BladeUserDetails;
 import org.springblade.auth.utils.TokenUtil;
+import org.springblade.auth.utils.WxAppletUtil;
 import org.springblade.common.cache.CacheNames;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.utils.ObjectUtil;
@@ -139,7 +139,7 @@ public class CaptchaTokenGranter extends AbstractTokenGranter {
         String jsCode = parameters.get("jsCode");
 
         // 获取openId
-        String openId = WxAppletUtil.getOpenId(WxAppletConstant.GET_OPEN_ID_URL, jsCode);
+        String openId = WxAppletUtil.getOpenId(WxAppletConstant.STORAGE_APPID, WxAppletConstant.STORAGE_SECRET, jsCode);
 
         IUserClient userClient = SpringUtil.getBean(IUserClient.class);
 

bladex/blade-auth/src/main/java/org/springblade/auth/utils/WxAppletUtil.java

@@ -0,0 +1,20 @@
+package org.springblade.auth.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.web.client.RestTemplate;
+
+public class WxAppletUtil {
+
+    private static final RestTemplate restTemplate = new RestTemplate();
+
+    public static String getOpenId(String appid, String secret, String code) {
+
+        String wxResult = restTemplate.getForObject("https://api.weixin.qq.com/sns/jscode2session?appid="
+                + appid + "&secret=" + secret + "&js_code=" + code + "&grant_type=authorization_code", String.class);
+
+        JSONObject wxResultMap = JSONObject.parseObject(wxResult);
+
+        return wxResultMap.get("openid").toString();
+    }
+
+}

hx-common/common-tool/src/main/java/com/fjhx/utils/BigDecimalUtil.java

@@ -52,6 +52,12 @@ public class BigDecimalUtil {
         return objToBigDecimal(v1).multiply(objToBigDecimal(v2));
     }
 
+    /**
+     * 乘法运算
+     */
+    public static BigDecimal multiply(Object v1, Object v2, int scale) {
+        return objToBigDecimal(v1).multiply(objToBigDecimal(v2).setScale(scale, RoundingMode.HALF_UP));
+    }
 
     /**
      * 除法运算

hx-service-api/storage-api/src/main/java/com/fjhx/entity/stock/StockBackCorrect.java

@@ -55,7 +55,7 @@ public class StockBackCorrect implements Serializable {
     /**
      * 修正原因
      */
-    private Integer correctReason;
+    private String correctReason;
 
     /**
      * 备注

hx-service/storage/src/main/java/com/fjhx/applet/controller/MaterialReceiveController.java

@@ -29,7 +29,7 @@ public class MaterialReceiveController {
 
     @PostMapping("/list")
     public R list(@RequestBody Map<String, String> condition) {
-        List<Map<String, Object>> list = materialReceiveService.getList(condition.get("jobNo"));
+        List<Map<String, Object>> list = materialReceiveService.getList(condition.get("account"));
         return R.success(list);
     }
 

hx-service/storage/src/main/java/com/fjhx/applet/mapper/MaterialReceiveMapper.java

@@ -18,7 +18,7 @@ public interface MaterialReceiveMapper extends BaseMapper<BaseEntity> {
                        @Param("FlowLinkId") String FlowLinkId
     );
 
-    List<Map<String, Object>> getList(@Param("jobNo") String jobNo);
+    List<Map<String, Object>> getList(@Param("account") String account);
 
     Integer countNum(@Param("account") String account);
 

hx-service/storage/src/main/java/com/fjhx/applet/mapper/MaterialReceiveMapper.xml

@@ -58,8 +58,9 @@
         from stock_waterdetial_copy1 swd
                  left join material m on swd.MaterialCode = m.code
                  left join u_user uu on swd.OperUserId = uu.ID
+                 left join acc_account aa on swd.OperUserId = aa.ID
         where swd.PickingStatus = 2
-          and uu.JobNo = #{jobNo}
+          and aa.AccountNo = #{account}
     </select>
 
     <select id="countNum" resultType="java.lang.Integer">

hx-service/storage/src/main/java/com/fjhx/applet/service/MaterialReceiveService.java

@@ -10,7 +10,7 @@ public interface MaterialReceiveService extends BaseService<BaseEntity> {
 
     void submit(String checkUserId);
 
-    List<Map<String, Object>> getList(String jobNo);
+    List<Map<String, Object>> getList(String account);
 
     void operation(Map<String, Object> condition);
 

hx-service/storage/src/main/java/com/fjhx/applet/service/impl/MaterialReceiveServiceImpl.java

@@ -89,9 +89,9 @@ public class MaterialReceiveServiceImpl extends ServiceImpl<MaterialReceiveMappe
     }
 
     @Override
-    public List<Map<String, Object>> getList(String jobNo) {
-        Assert.notEmpty(jobNo, "工号不能为空");
-        return baseMapper.getList(jobNo);
+    public List<Map<String, Object>> getList(String account) {
+        Assert.notEmpty(account, "账号不能为空");
+        return baseMapper.getList(account);
     }
 
     @Override

hx-service/storage/src/main/java/com/fjhx/stock/controller/StockBackController.java

@@ -1,6 +1,5 @@
 package com.fjhx.stock.controller;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.stock.StockBackCorrect;
 import com.fjhx.entity.stock.StockBackDetails;
@@ -90,7 +89,7 @@ public class StockBackController {
     @PostMapping("/correctSave")
     public R correctSave(@RequestBody StockBackCorrect stockBackCorrect) {
         stockBackCorrect.setCreateTime(new Date());
-        stockBackCorrectService.update(stockBackCorrect, Wrappers.<StockBackCorrect>lambdaUpdate().eq(StockBackCorrect::getId, stockBackCorrect.getId()));
+        stockBackCorrectService.save(stockBackCorrect);
         return R.success();
     }
 

hx-service/storage/src/main/java/com/fjhx/task/controller/ScheduleTaskController.java

@@ -1,5 +1,6 @@
 package com.fjhx.task.controller;
 
+import com.fjhx.stock.service.StockBackPlanService;
 import com.fjhx.task.service.ScheduleTaskService;
 import org.springblade.core.launch.BladeApplication;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,11 +15,17 @@ public class ScheduleTaskController {
     @Autowired
     private ScheduleTaskService scheduleTaskService;
 
+    @Autowired
+    private StockBackPlanService stockBackPlanService;
+
     /**
      * 定时推送id与工号不一致的信息
      */
     @Scheduled(cron = "0 0/10 * * * ?")
     private void stockAcceptActionTask() {
+        if (BladeApplication.isLocalDev()) {
+            return;
+        }
         scheduleTaskService.stockAcceptActionTask();
     }
 
@@ -33,4 +40,28 @@ public class ScheduleTaskController {
         scheduleTaskService.schedulingTask();
     }
 
+    /**
+     * 获取排班面积
+     */
+    @Scheduled(cron = "0 35 7,19 * * ?")
+//    @Scheduled(cron = "0 * * * * ?")
+    private void getScheduleTask() {
+        if (BladeApplication.isLocalDev()) {
+            return;
+        }
+        stockBackPlanService.getScheduleTask();
+    }
+
+    /**
+     * 统计排班数据
+     */
+    @Scheduled(cron = "0 05 8,20 * * ?")
+    private void statisticsScheduleDateTask() {
+//        if (BladeApplication.isLocalDev()) {
+//            return;
+//        }
+        stockBackPlanService.statisticsScheduleDateTask();
+    }
+
+
 }