blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreservePlanServiceImpl.java

@@ -195,6 +195,10 @@ public class DsBatchPreservePlanServiceImpl extends BaseServiceImpl<DsBatchPrese
 				dsBatchPreserveTaskEntity.setTaskCreateTime(new Date());
 				dsBatchPreserveTaskEntity.setTaskStatus(BatchConstant.TO_BE_MAINTAINED.longValue());
 				batchPreserveTaskService.save(dsBatchPreserveTaskEntity);
+
+				//创建代办
+				mesApprovalRecordService.createApproval
+						(dsBatchPreserveTaskEntity.getId(), MesApprovalRecordBizTypeEnum.BATCH_PLANNING_TASK.getDesc(),AuthUtil.getUser().getUserId(),new Date());
 			}
 		}
 	}
@@ -214,6 +218,10 @@ public class DsBatchPreservePlanServiceImpl extends BaseServiceImpl<DsBatchPrese
 				dsBatchPreserveTaskEntity.setTaskCreateTime(new Date());
 				dsBatchPreserveTaskEntity.setTaskStatus(BatchConstant.TO_BE_MAINTAINED.longValue());
 				batchPreserveTaskService.save(dsBatchPreserveTaskEntity);
+
+				//创建代办
+				mesApprovalRecordService.createApproval
+						(dsBatchPreserveTaskEntity.getId(), MesApprovalRecordBizTypeEnum.BATCH_PLANNING_TASK.getDesc(),AuthUtil.getUser().getUserId(),new Date());
 			}
 		}
 
@@ -549,6 +557,10 @@ public class DsBatchPreservePlanServiceImpl extends BaseServiceImpl<DsBatchPrese
 		dsBatchPreserveTask.setTaskStatus(BatchConstant.TO_BE_MAINTAINED.longValue());
 		batchPreserveTaskService.save(dsBatchPreserveTask);
 
+		//创建代办
+		mesApprovalRecordService.createApproval
+				(dsBatchPreserveTask.getId(), MesApprovalRecordBizTypeEnum.BATCH_PLANNING_TASK.getDesc(),AuthUtil.getUser().getUserId(),new Date());
+
 	}
 
 

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreserveTaskServiceImpl.java

@@ -129,10 +129,6 @@ public class DsBatchPreserveTaskServiceImpl extends BaseServiceImpl<DsBatchPrese
 				dsBatchPreserveTaskEntity.setIsQualified(dsBatchPreserveTask.getIsQualified());
 				dsBatchPreserveTaskEntity.setActualValue(dsBatchPreserveTask.getActualValue());
 				batchPreserveTaskMapper.updateById(dsBatchPreserveTaskEntity);
-
-				//创建代办
-				mesApprovalRecordService.createApproval
-						(dsBatchPreserveTaskEntity.getId(), MesApprovalRecordBizTypeEnum.BATCH_PLANNING_TASK.getDesc(),AuthUtil.getUser().getUserId(),new Date());
 			}
 		}
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderDailyAssignImpl.java

@@ -23,7 +23,6 @@ import org.springblade.desk.order.service.IYieldOrderDailyAssignService;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -180,10 +179,10 @@ public class YieldOrderDailyAssignImpl extends BaseServiceImpl<YieldOrderDailyAs
 			if (bpas.getWeekAssign() == null || bpas.getWeekAssign().compareTo(BigDecimal.ZERO) == 0) {
 				bpas.setFactor(bpas.getAssignScale().divide(BigDecimal.valueOf(100)).multiply(BigDecimal.valueOf(10000)) );
 			} else {
-				if (bpas.getClassifyAssign().compareTo(BigDecimal.ZERO) == 0) {
+				if(bpas.getClassifyAssign().compareTo(BigDecimal.ZERO) ==0){
 					bpas.setFactor(BigDecimal.ZERO);
-				} else {
+				}else{
-					bpas.setFactor(bpas.getAssignScale().divide(BigDecimal.valueOf(100)).divide(bpas.getWeekAssign().divide(bpas.getClassifyAssign(), 5, RoundingMode.HALF_UP), 5, RoundingMode.HALF_UP));
+					bpas.setFactor(bpas.getAssignScale().divide(BigDecimal.valueOf(100)).divide (bpas.getWeekAssign().divide(bpas.getClassifyAssign())));
 				}
 			}
 			planAssignSteerService.updateById(bpas);

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

@@ -118,11 +118,6 @@
         <if test="stGoods.goodsCode != null and stGoods.goodsCode != ''">
             AND g.goods_code LIKE '%' || #{stGoods.goodsCode} || '%'
         </if>
-
-        <if test="stGoods.goodsName != null and stGoods.goodsName != ''">
-            AND g.goods_name LIKE '%' || #{stGoods.goodsName} || '%'
-        </if>
-
         <if test="stGoods.shId != null and stGoods.shId != ''">
             AND sl.sh_id = #{stGoods.shId}
         </if>