opt: 销售单调整

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@@ -603,7 +603,7 @@ public class BmsSupplierController {
             bmsSupplier.setRegion2Label(region2.getName());
         }
         List<SysUserSimpleVo> userVos = new ArrayList<>();
-        if(bmsSupplier.getUserId()!=null){
+        if(StringUtils.hasText(bmsSupplier.getUserId())){
             SysUser sysUser = sysUserService.getById(bmsSupplier.getUserId());
             SysUserSimpleVo simpleVo = sysUser.toSimpleVo(true);
             simpleVo.setSupplierMainFlag(1);

src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java

@@ -268,6 +268,11 @@ public class OmsSaleOrder implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private LocalDate preDeliveryDate;
 
+    /**
+     * preDeliveryState=1，不自动触发更新
+     */
+    private Integer preDeliveryState;
+
     /** 生产备注 */
     private String productionRemark;
 

src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderService.java

@@ -31,6 +31,8 @@ public interface OmsSaleOrderService extends IService<OmsSaleOrder> {
      */
     OmsPlanResult getPlanList(OmsPlanParam param);
 
+    void flushPreDelivery(String orderId);
+
     BigDecimal getExpiredOrderRateById(String oaId);
 
     List<SimpleKeyValue<String>> selectExpiredOrderRates();

src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java

@@ -136,12 +136,12 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
 
             if(StringUtil.isNotEmpty(param.getOmsOrderId())){
                 OmsSaleOrder order = this.getById(param.getOmsOrderId());
-                if(order.getOrderStatusCombo()<2){
+                if(order.getPreDeliveryState()==null||order.getPreDeliveryState().equals(0)){
                     OmsSaleOrder updSaleOrder = new OmsSaleOrder();
                     updSaleOrder.setId(order.getId());
                     updSaleOrder.setPreProductionDate(DateUtils.toLocalDate(deliveryDate));
                     updSaleOrder.setProductionRemark(remark);
-                    this.updateById(order);
+                    this.updateById(updSaleOrder);
                     List<OmsSaleOrderItem> omsSaleOrderItems = omsSaleOrderItemService.listByOrderId(Long.parseLong(param.getOmsOrderId()));
                     for (OmsSaleOrderItem orderItem : omsSaleOrderItems) {
                         for (OmsPlanResult.InvPlanItem planItem : itemList) {
@@ -159,6 +159,26 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
         return null;
     }
 
+    @Override
+    public void flushPreDelivery(String orderId) {
+        OmsSaleOrder order = this.getById(orderId);
+        if(order.getPreDeliveryState()==null||order.getPreDeliveryState().equals(0)){
+            List<OmsSaleOrderItem> omsSaleOrderItems = omsSaleOrderItemService.listByOrderId(Long.parseLong(orderId));
+            OmsPlanParam omsPlanParam = new OmsPlanParam();
+            omsPlanParam.setOmsOrderId(orderId);
+            List<OmsPlanParam.InvItem> invItemList = new ArrayList<>();
+            for (OmsSaleOrderItem orderItem : omsSaleOrderItems) {
+                OmsPlanParam.InvItem invItem = new OmsPlanParam.InvItem();
+                invItem.setInvCode(orderItem.getSkuCode());
+                invItem.setQty(orderItem.getQuantity());
+                invItemList.add(invItem);
+            }
+            omsPlanParam.setInvItemList(invItemList);
+            this.getPlanList(omsPlanParam);
+        }
+
+    }
+
     @Override
     public BigDecimal getExpiredOrderRateById(String oaId) {
         return baseMapper.getExpiredOrderRates(oaId);
@@ -432,6 +452,10 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
         omsSaleOrderItemService.remove(rmItemLqw);
         //重新保存item
         omsSaleOrderItemService.saveBatch(newOrderItemList);
+
+        //刷新订单发货时间
+        this.flushPreDelivery(order.getId() + "");
+
         //立即下单
         if (param.getInstantFlag() != null && param.getInstantFlag().equals(1)) {
             this.buildPriceOrder(order.getId() + "", null);
@@ -1186,7 +1210,16 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
         if(!omsOrder.getOrderType().equals(3)){
             omsOrder.setCheckUserId(AuthContextUtils.getSysUserId());
         }
+        //将员工信息前置
+        if(omsOrder.getUserPhone()==null){
+            omsOrder.setUserPhone("-");
+        }
+        String remark = omsOrder.getRemark()==null?"":omsOrder.getRemark();
+        String userAndPhone = omsOrder.getUserName()+"("+omsOrder.getUserPhone()+")";
+        omsOrder.setRemark(userAndPhone + remark.replace(userAndPhone,""));
         this.updateById(omsOrder);
+
+        this.flushPreDelivery(omsOrder.getId()+"");
     }
 
     @Override

src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java

@@ -87,7 +87,8 @@ public class TbsActivityController {
     @GetMapping("/reset/{id}")
     public R<?> reset(@PathVariable("id") Long id){
         tbsActivityDebugApplicationService.reset(id);
-        return R.ok();
+        TbsActivity activity = tbsActivityService.getById(id);
+        return R.ok(activity.getActivityCode()+"=="+activity.getActTitle());
     }
 
     @GetMapping("/resetList")

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -418,17 +418,23 @@ public class VtbVerificationController {
      * @return
      */
     @GetMapping("/toPayRequest")
-    public R<?> toPayRequest(Long verificationId,Integer fullState){
+    public R<?> toPayRequest(Long verificationId,Integer fullState,String verCode){
         //预先调用伟成同步状态接口，减少查询记录数
         String url = projectApisProperties.getCheckPayStatus();
         HttpUtil.doGet(url,null);
-        if(fullState!=null&&fullState.equals(1)){
+        //不在维护true
+        if(fullState!=null&&fullState.equals(1)&&false){
             List<Long> vids = vtbVerificationMapper.listNotPayVerifyIds();
             for (Long vid : vids) {
                 vtbVerificationService.toPayRequest(vid);
             }
         }else {
+            VtbVerification verification = vtbVerificationMapper.selectById(verificationId);
+            if(verification.getVerificationCode().equals(verCode)){
                 vtbVerificationService.toPayRequest(verificationId);
+                return R.ok();
+            }
+            return R.error("missCode");
         }
         return R.ok();
     }

src/main/java/com/qs/serve/task/TzcPolicyTask.java

@@ -40,7 +40,7 @@ public class TzcPolicyTask {
     /**
      * 同步政策到销路通
      */
-    @Scheduled(cron="0 0 3 * * ?")
+    @Scheduled(cron="0 20 * * * ?")
     public void syncPolicyToXlt(){
         AuthContextUtils.setTenant("001");
         LambdaQueryWrapper<TzcPolicyItem> itemLqw = new LambdaQueryWrapper<>();