bug修复完成

cement-business/pom.xml

@@ -230,8 +230,8 @@
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <!--<include>*.xlsx</include>-->
-                    <include>*</include>
+                    <!--<include>*.xlsx</include>
+                    <include>*</include>-->
                 </includes>
             </resource>
 

cement-business/src/main/java/cn/wise/sc/cement/business/controller/SupplierController.java

@@ -105,8 +105,7 @@ public class SupplierController {
 	@PostMapping("/delete/{id}")
 	public BaseResponse delete(@PathVariable Integer id) {
 		try {
-			supplierService.removeById(id);
-			return BaseResponse.okData("删除成功");
+			return supplierService.deleteSupplier(id);
 		} catch (Exception e) {
 			log.debug("删除供应商{}", e);
 		}

cement-business/src/main/java/cn/wise/sc/cement/business/entity/Consumables.java

@@ -61,7 +61,7 @@ public class Consumables implements Serializable {
 
 	@ApiModelProperty("入库数量 （单位：瓶）")
 	@TableField(exist = false)
-	private Integer enterNum;
+	private BigDecimal enterNum;
 
 	@ApiModelProperty("多少g/瓶")
 	private BigDecimal unitStock;

cement-business/src/main/java/cn/wise/sc/cement/business/entity/ConsumablesEnter.java

@@ -41,7 +41,7 @@ public class ConsumablesEnter implements Serializable {
 	private Integer userId;
 
 	@ApiModelProperty("新增数量 瓶")
-	private Integer enterNum;
+	private BigDecimal enterNum;
 
 	@ApiModelProperty("创建时间")
 	private LocalDateTime createTime;

cement-business/src/main/java/cn/wise/sc/cement/business/entity/StandardEnter.java

@@ -42,7 +42,7 @@ public class StandardEnter implements Serializable {
 	private Integer userId;
 
 	@ApiModelProperty("新增数量(单位： 瓶)")
-	private Integer enterNum;
+	private BigDecimal enterNum;
 
 	@ApiModelProperty("创建时间")
 	private LocalDateTime createTime;

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleDistributionMapper.java

@@ -28,6 +28,9 @@ public interface SampleDistributionMapper extends BaseMapper<SampleDistribution>
 	List<SampleDistributionTeamVo> getDistributionTeamList(@Param("sampleId") Integer sampleId,
 	                                                       @Param("userId") Integer userId);
 
+	List<SampleDistributionTeamVo> getDistributionTeamResultList(@Param("sampleId") Integer sampleId,
+	                                                       @Param("userId") Integer userId);
+
 	List<SampleTeamGroupUserVo> getDistributionTeamGroupList(@Param("sampleId") Integer sampleId,
 	                                                         @Param("userId") Integer userId);
 

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanConsumablesPurchaseMapper.xml

@@ -68,7 +68,15 @@
     </sql>
 
     <select id="exportWordList" resultType="cn.wise.sc.cement.business.model.vo.PlanConsumablesPurchaseVo">
-        SELECT t.*, su.name as purchaserName
+        SELECT
+        IF(ISNULL(t.name),'',t.name)  as name,
+        IF(ISNULL(t.model),'',t.model)  as model,
+        IF(ISNULL(t.technical_index),'',t.technical_index)  as technicalIndex,
+        IF(ISNULL(t.production_unit),'',t.production_unit)   as productionUnit,
+        IF(ISNULL(t.purchase_num),'',t.purchase_num)   as purchaseNum,
+        IF(ISNULL(t.unit_price),'',t.unit_price)  as unitPrice,
+        IF(ISNULL(t.purchase_date),'',t.purchase_date)  as purchaseDate,
+        IF(ISNULL(t.implementation),'',t.implementation)  as implementation
         FROM plan_consumables_purchase t
         left join sys_user su on su.id = t.purchaser_id
         <include refid="whereNew"/>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanEquipmentMaintainMapper.xml

@@ -62,7 +62,15 @@
     </sql>
 
     <select id="exportWordList" resultType="cn.wise.sc.cement.business.model.vo.PlanEquipmentMaintainVo">
-        SELECT t.*, su.name as maintainerName
+        SELECT
+        IF(ISNULL(t.name),'',t.name)  as name,
+        IF(ISNULL(t.model),'',t.model)  as model,
+        IF(ISNULL(t.code),'',t.code)  as code,
+        IF(ISNULL(t.maintain_date),'',t.maintain_date)   as maintainDate,
+        IF(ISNULL(t.maintain_content),'',t.maintain_content)  as maintainContent,
+        IF(ISNULL(su.name),'',su.name)  as maintainerName,
+        IF(ISNULL(t.maintain_result),'',t.maintain_result)  as maintainResult,
+        IF(ISNULL(t.implementation),'',t.implementation)  as implementation
         FROM plan_equipment_maintain t
         left join sys_user su on su.id = t.maintainer_id
         <include refid="whereNew"/>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanEquipmentPurchaseMapper.xml

@@ -68,7 +68,16 @@
     </sql>
 
     <select id="exportWordList" resultType="cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo">
-        SELECT t.*, su.name as purchaserName
+        SELECT
+        IF(ISNULL(t.name),'',t.name)  as name,
+        IF(ISNULL(t.model),'',t.model)  as model,
+        IF(ISNULL(t.technical_index),'',t.technical_index)  as technicalIndex,
+        IF(ISNULL(t.unit_price),'',t.unit_price)  as unitPrice,
+        IF(ISNULL(t.production_unit),'',t.production_unit)  as productionUnit,
+        IF(ISNULL(t.purchase_num),'',t.purchase_num)  as purchaseNum,
+        IF(ISNULL(t.purchase_date),'',t.purchase_date)  as purchaseDateStr,
+        IF(ISNULL(su.name),'',su.name)  as purchaserName,
+        IF(ISNULL(t.implementation),'',t.implementation)  as implementation
         FROM plan_equipment_purchase t
         left join sys_user su on su.id = t.purchaser_id
         <include refid="whereNew"/>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanEquipmentRepairMapper.xml

@@ -55,7 +55,15 @@
     </sql>
 
     <select id="exportWordList" resultType="cn.wise.sc.cement.business.model.vo.PlanEquipmentRepairVo">
-        SELECT t.*, su.name as repairerName
+        SELECT
+        IF(ISNULL(t.name),'',t.name)  as name,
+        IF(ISNULL(t.model),'',t.model)  as model,
+        IF(ISNULL(t.technical_index),'',t.technical_index)  as technicalIndex,
+        IF(ISNULL(t.unit_price),'',t.unit_price)  as unitPrice,
+        IF(ISNULL(t.production_unit),'',t.production_unit)   as productionUnit,
+        IF(ISNULL(t.repair_date),'',t.repair_date)  as repairDate,
+        IF(ISNULL(su.name),'',su.name)  as repairerName,
+        IF(ISNULL(t.implementation),'',t.implementation)  as implementation
         FROM plan_equipment_repair t
         left join sys_user su on su.id = t.repairer_id
         <include refid="whereNew"/>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanStandardPurchaseMapper.xml

@@ -65,7 +65,14 @@
         </where>
     </sql>
     <select id="wordList" resultType="cn.wise.sc.cement.business.model.vo.PlanStandardPurchaseVo">
-        SELECT t.*, su.name as purchaserName
+        SELECT
+        IF(ISNULL(t.name),'',t.name)  as name,
+        IF(ISNULL(t.code),'',t.code)  as code,
+        IF(ISNULL(t.distribution_unit),'',t.distribution_unit)  as distributionUnit,
+        IF(ISNULL(t.purchase_num),'',t.purchase_num)   as purchaseNum,
+        IF(ISNULL(t.purchase_date),'',t.purchase_date)  as createTimeStr,
+        IF(ISNULL(su.name),'',su.name)  as purchaserName,
+        IF(ISNULL(t.remark),'',t.remark)  as remark
         FROM plan_standard_purchase t
         left join sys_user su on su.id = t.purchaser_id
         <include refid="whereNew"/>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleDistributionMapper.xml

@@ -52,6 +52,32 @@
     </select>
 
     <select id="getDistributionTeamList" resultType="cn.wise.sc.cement.business.model.vo.SampleDistributionTeamVo">
+        select t.id as distributionId, su.id as userId, su.name as userName,
+        t.team_group_id as teamGroupId, tg.name as teamGroupName, s.id as teamId, s.name as teamName,
+        t.status as status,
+        (
+        CASE t.status
+        WHEN 0 THEN '未接受'
+        WHEN 1 THEN '接受'
+        WHEN 2 THEN '待校核'
+        WHEN 3 THEN '退回'
+        WHEN 4 THEN '校核通过'
+        WHEN 5 THEN '校核退回'
+        ELSE ''
+        END
+        ) as statusValue
+        from sample_distribution t
+        left join sys_user su on su.id = t.user_id
+        left join team s on s.id = t.team_id
+        left join team_group tg on tg.id = t.team_group_id
+        where t.sample_id = #{sampleId} and s.is_pf != 0
+        <if test="userId != null">
+            and t.user_id = #{userId}
+        </if>
+        order by t.id asc
+    </select>
+
+    <select id="getDistributionTeamResultList" resultType="cn.wise.sc.cement.business.model.vo.SampleDistributionTeamVo">
         select t.id as distributionId, su.id as userId, su.name as userName,
         t.team_group_id as teamGroupId, tg.name as teamGroupName, s.id as teamId, s.name as teamName,
         t.status as status,
@@ -77,6 +103,10 @@
         order by t.id asc
     </select>
 
+
+
+
+
     <select id="getDistributionTeamGroupList" resultType="cn.wise.sc.cement.business.model.vo.SampleTeamGroupUserVo">
         select su.id as userId,
         t.team_group_id as teamGroupId

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleMapper.xml

@@ -96,16 +96,16 @@
 
     <select id="exportWordList" resultType="cn.wise.sc.cement.business.model.SampleWord">
         SELECT
-            e.project_name AS project_name,
-            e.entrust_code,
-            s.name,
-            s.cement_code,
-            s.weight,
-            s.original_position,
-            date_format(s.create_time, '%Y/%m/%d') as create_time,
-            s.remark,
-            date_format(s.destruction_time, '%Y/%m/%d') as destruction_time,
-            su.name AS user_name
+        IF(ISNULL(e.project_name),'',e.project_name)  AS projectName,
+        IF(ISNULL(e.entrust_code),'',e.entrust_code) AS entrustCode,
+        IF(ISNULL(s.name),'',s.name) AS name,
+        IF(ISNULL(s.cement_code),'',s.cement_code) AS cementCode,
+        IF(ISNULL(s.weight),'',s.weight) AS weight,
+        IF(ISNULL(s.original_position),'',s.original_position) AS originalPosition,
+        IF(ISNULL(s.create_time),'',date_format(s.create_time, '%Y/%m/%d'))  AS createTime,
+        IF(ISNULL(s.remark),'',s.remark) AS remark,
+        IF(ISNULL(s.destruction_time),'',date_format(s.destruction_time, '%Y/%m/%d'))  AS destructionTime,
+        IF(ISNULL(su.name),'',su.name) AS userName
         FROM
             sample s
             LEFT JOIN entrust e ON s.entrust_id = e.id

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/ChangeStockQuery.java

@@ -25,7 +25,7 @@ public class ChangeStockQuery {
 	 * 新增数量 / 领用数量
 	 */
 	@ApiModelProperty("入库数量（单位 瓶）")
-	private Integer enterNum;
+	private BigDecimal enterNum;
 
 	@ApiModelProperty("领用数量（单位 g）")
 	private BigDecimal outNum;

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/StandardQuery.java

@@ -45,14 +45,14 @@ public class StandardQuery {
 	@ApiModelProperty("存储位置")
 	private String position;
 
-	@ApiModelProperty("入库数量 （单位：瓶）")
-	private Integer enterNum;
+	/*@ApiModelProperty("入库数量 （单位：瓶）")
+	private Integer enterNum;*/
 
 	@ApiModelProperty("多少g/瓶")
 	private BigDecimal unitStock;
 
 	@ApiModelProperty("库存提醒数量（少于多少进行提醒）")
-	private Integer leastNum;
+	private BigDecimal leastNum;
 
 	@ApiModelProperty("备注")
 	private String remark;

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanConsumablesPurchaseVo.java

@@ -31,16 +31,16 @@ public class PlanConsumablesPurchaseVo {
 	private String technicalIndex;
 
 	@ApiModelProperty("单价（万元）")
-	private BigDecimal unitPrice;
+	private String unitPrice;
 
 	@ApiModelProperty("生产单位")
 	private String productionUnit;
 
 	@ApiModelProperty("采购数量")
-	private Integer purchaseNum;
+	private String purchaseNum;
 
 	@ApiModelProperty("采购日期（购买日期）")
-	private LocalDate purchaseDate;
+	private String purchaseDate;
 
 	@ApiModelProperty("采购人id")
 	private Integer purchaserId;

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanEquipmentMaintainVo.java

@@ -31,7 +31,7 @@ public class PlanEquipmentMaintainVo {
 	private String code;
 
 	@ApiModelProperty("维护日期")
-	private LocalDate maintainDate;
+	private String maintainDate;
 
 	@ApiModelProperty("创建人id")
 	private Integer userId;

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanEquipmentPurchaseVo.java

@@ -31,7 +31,7 @@ public class PlanEquipmentPurchaseVo {
 	private String technicalIndex;
 
 	@ApiModelProperty("单价（万元）")
-	private BigDecimal unitPrice;
+	private String unitPrice;
 
 	@ApiModelProperty("生产单位")
 	private String productionUnit;
@@ -40,7 +40,7 @@ public class PlanEquipmentPurchaseVo {
 	private Integer purchaseNum;
 
 	@ApiModelProperty("采购日期（购买日期）")
-	private LocalDate purchaseDate;
+	private String purchaseDate;
 
 	@ApiModelProperty("采购人id")
 	private Integer purchaserId;

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanEquipmentRepairVo.java

@@ -31,13 +31,13 @@ public class PlanEquipmentRepairVo {
 	private String technicalIndex;
 
 	@ApiModelProperty("单价（万元）")
-	private BigDecimal unitPrice;
+	private String unitPrice;
 
 	@ApiModelProperty("生产单位")
 	private String productionUnit;
 
 	@ApiModelProperty("维修日期")
-	private LocalDate repairDate;
+	private String repairDate;
 
 	@ApiModelProperty("创建人id")
 	private Integer userId;

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanStandardPurchaseVo.java

@@ -34,7 +34,7 @@ public class PlanStandardPurchaseVo {
 	private Integer purchaseNum;
 
 	@ApiModelProperty("采购日期（购买日期）")
-	private LocalDate purchaseDate;
+	private String purchaseDate;
 
 	@ApiModelProperty("采购人id")
 	private Integer purchaserId;

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/StandardVo.java

@@ -54,6 +54,9 @@ public class StandardVo {
 	@ApiModelProperty("库存数量")
 	private BigDecimal stockNum;
 
+	@ApiModelProperty("多少g/瓶")
+	private BigDecimal unitStock;
+
 	@ApiModelProperty("库存提醒数量（少于多少进行提醒）")
 	private BigDecimal leastNum;
 
@@ -72,4 +75,7 @@ public class StandardVo {
 	@ApiModelProperty("标准值")
 	private List<StandardValue> standardValueList;
 
+	@ApiModelProperty("产地")
+	private String origin;
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/ISupplierService.java

@@ -31,4 +31,6 @@ public interface ISupplierService extends IService<Supplier> {
 
 	BaseResponse<String> deleteEnclosure(Integer id);
 
+	BaseResponse<String> deleteSupplier(Integer id);
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/ConsumablesServiceImpl.java

@@ -144,7 +144,7 @@ public class ConsumablesServiceImpl extends ServiceImpl<ConsumablesMapper, Consu
 			return BaseResponse.errorMsg(query.getName() + "已存在");
 		}
 		if(query.getEnterNum() != null && query.getUnitStock() != null){
-			BigDecimal stockNum = new BigDecimal(query.getEnterNum()).multiply(query.getUnitStock());
+			BigDecimal stockNum = query.getEnterNum().multiply(query.getUnitStock());
 			query.setStockNum(stockNum);
 		}else{
 			query.setStockNum(new BigDecimal(0));
@@ -210,7 +210,7 @@ public class ConsumablesServiceImpl extends ServiceImpl<ConsumablesMapper, Consu
 				.setCreateTime(LocalDateTime.now())
 				.setRemark(query.getRemark());
 		consumablesEnterMapper.insert(enter);
-		consumables.setStockNum(consumables.getStockNum().add( consumables.getUnitStock().multiply(new BigDecimal(enter.getEnterNum()))));
+		consumables.setStockNum(consumables.getStockNum().add( consumables.getUnitStock().multiply(enter.getEnterNum())));
 		consumablesMapper.updateById(consumables);
 		return BaseResponse.okData("新增入库完成");
 	}

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -684,9 +684,11 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                             TeamVo teamVo = teamMapper.getDetail(Integer.valueOf(teamId));
                             //如果本所编号不相等 则为副样，副样需要判断检测项是否需要平行样，如果不需要不用进行派发检测
                             if(!sample.getCementCode().equals(sample.getParallelCode()) && teamVo.getIsParallel() == 0){
-                                continue;
+                                break;
                             }
                             if (teamVo != null && teamVo.getIsPf()!=0 ) {
+
+
                                 if(!teamGroupIdList.contains(teamVo.getGroupId())){
                                     teamGroupIdList.add(teamVo.getGroupId());
                                     SampleTeamGroupVo sampleTeamGroupVo = new SampleTeamGroupVo();
@@ -719,7 +721,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 
                                 teamName = teamName.equals("") ? teamVo.getName() : (teamName + "、" + teamVo.getName());
                             }
-
                         }
                     }
                     sampleVo.setTeamName(teamName);
@@ -1083,9 +1084,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                 SampleVo sampleVo = new SampleVo();
                 BeanUtils.copyProperties(sample, sampleVo);
                 List<SampleDistributionTeamVo> sampleDistributionTeamVoList =
-                        distributionMapper.getDistributionTeamList(sample.getId(), null);
-
-
+                        distributionMapper.getDistributionTeamResultList(sample.getId(), null);
                 if (sampleDistributionTeamVoList != null && sampleDistributionTeamVoList.size() > 0) {
                     //已经派发过的列表
                    /* List<SampleTeamGroupVo> sampleTeamGroupVoListed = new ArrayList<>();
@@ -1159,7 +1158,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                 SampleVo sampleVo = new SampleVo();
                 BeanUtils.copyProperties(sample, sampleVo);
                 List<SampleDistributionTeamVo> sampleDistributionTeamVoList =
-                        distributionMapper.getDistributionTeamList(sample.getId(), null);
+                        distributionMapper.getDistributionTeamResultList(sample.getId(), null);
 
                 if (sampleDistributionTeamVoList != null && sampleDistributionTeamVoList.size() > 0) {
                     //已经派发过的列表
@@ -1477,75 +1476,79 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             String userIds = "";
             List<Integer> userIdList = new ArrayList<>();
             for (Sample sample : sampleList) {
-                //样品的处理项
+		        //样品的处理项
 //                List<Integer> handleUserIds = new ArrayList<>();
-                String teamIds = sample.getTeamIds();
-                if (teamIds != null) {
-                    String[] teamIdS = teamIds.split("、");
-                    List<Integer> handleIds = new ArrayList<>();
-                    for (String teamId : teamIdS) {
-                        TeamVo teamVo = teamMapper.getDetail(Integer.valueOf(teamId));
-                        if (teamVo != null) {
-                            if(StringUtils.isNotBlank(teamVo.getHandleId())){
-                                String[] handles = teamVo.getHandleId().split("、");
-                                for (String handleId : handles) {
-                                    HandleVo handleVo = handleMapper.getDetail(Integer.valueOf(handleId));
-                                    if(handleVo != null && !userIdList.contains(handleVo.getUserId())){
-                                        userIdList.add(handleVo.getUserId());
-                                    }
-                                    //样品处理表 同一个样品多个相同处理项时 去重。
-                                    if(handleVo != null && !handleIds.contains(handleVo.getId())){
-                                        //20201229修改 ，去重处理项id
-                                        handleIds.add(handleVo.getId());
-                                        SampleHandle sampleHandle = new SampleHandle();
-                                        sampleHandle.setSampleId(sample.getId())
-                                                .setUserId(handleVo.getUserId())
-                                                .setHandleId(handleVo.getId())
-                                                .setPlanFinishDate(null)    //样品处理要求完成放到了委托表，评审的时候直接设定
+		        String teamIds = sample.getTeamIds();
+		        if (teamIds != null) {
+			        String[] teamIdS = teamIds.split("、");
+			        List<Integer> handleIds = new ArrayList<>();
+			        for (String teamId : teamIdS) {
+				        TeamVo teamVo = teamMapper.getDetail(Integer.valueOf(teamId));
+				        if (teamVo != null) {
+					        if(StringUtils.isNotBlank(teamVo.getHandleId())){
+						        String[] handles = teamVo.getHandleId().split("、");
+						        for (String handleId : handles) {
+							        HandleVo handleVo = handleMapper.getDetail(Integer.valueOf(handleId));
+							        if(handleVo != null && !userIdList.contains(handleVo.getUserId())){
+								        userIdList.add(handleVo.getUserId());
+							        }
+							        //样品处理表 同一个样品多个相同处理项时 去重。
+							        if(handleVo != null && !handleIds.contains(handleVo.getId())){
+								        //20201229修改 ，去重处理项id
+								        handleIds.add(handleVo.getId());
+								        SampleHandle sampleHandle = new SampleHandle();
+								        sampleHandle.setSampleId(sample.getId())
+										        .setUserId(handleVo.getUserId())
+										        .setHandleId(handleVo.getId())
+										        .setPlanFinishDate(null)    //样品处理要求完成放到了委托表，评审的时候直接设定
 //				                        .setStatus(0)
-                                                .setCreateTime(LocalDateTime.now())
-                                                .setStatus(1)  //直接默认接收
-                                                .setAcceptTime(LocalDateTime.now());
-                                        sampleHandleMapper.insert(sampleHandle);
-                                        if(sampleHandle.getHandleId() != null){
-                                            Handle handle = handleMapper.selectById(sampleHandle.getHandleId());
-                                            if (handle == null) {
-                                                return BaseResponse.errorMsg("选择的处理项信息有误");
-                                            }
-                                            //获取产值信息
-                                            QueryWrapper<NormProduction> queryWrapper = new QueryWrapper<>();
-                                            queryWrapper.eq("assess_id", handle.getId());
-                                            queryWrapper.eq("type", 0);
-                                            queryWrapper.eq("status", 1);
-                                            List<NormProduction> normProduction = iNormProductionService.list(queryWrapper);
-                                            if(normProduction == null || normProduction.size() != 1){
-                                                //评审未通过，删除评审后的样品
-                                                sampleMapper.deleteBatchIds(sampleList);
-                                                //还原本所编号最大值
+										        .setCreateTime(LocalDateTime.now())
+										        .setStatus(1)  //直接默认接收
+										        .setAcceptTime(LocalDateTime.now());
+								        sampleHandleMapper.insert(sampleHandle);
+								        if(sampleHandle.getHandleId() != null){
+									        Handle handle = handleMapper.selectById(sampleHandle.getHandleId());
+									        if (handle == null) {
+										        return BaseResponse.errorMsg("选择的处理项信息有误");
+									        }
+									        //获取产值信息
+									        QueryWrapper<NormProduction> queryWrapper = new QueryWrapper<>();
+									        queryWrapper.eq("assess_id", handle.getId());
+									        queryWrapper.eq("type", 0);
+									        queryWrapper.eq("status", 1);
+									        List<NormProduction> normProduction = iNormProductionService.list(queryWrapper);
+									        if(normProduction == null || normProduction.size() != 1){
+										        //评审未通过，删除评审后的样品
+										        sampleMapper.deleteBatchIds(sampleList);
+										        //还原本所编号最大值
 //                                                redisUtil.setString("maxCementCode", redisMaxCementCode);
-                                                return BaseResponse.errorMsg("请配置处理项名称为"+handle.getName()+"的产值信息!");
-                                            }
-                                        }
-                                        //消息推送
-                                        BaseResponse wrapper = userMessageService.sendMessage(sampleHandle.getUserId(), "您有一条样品处理信息等待处理",entrust.getId(), SysUserMessage.MessageType.ENTRUST);
-                                        if(wrapper.getCode() != 200){
-                                            return wrapper;
-                                        }
-
-                                        SysUser handleUser = userService.getById(sampleHandle.getUserId());
-                                        if(handleUser == null){
-                                            return BaseResponse.errorMsg("样品处理人信息错误");
-                                        }
-                                        if(StringUtils.isNotBlank(handleUser.getWxId()) && !userIdList.contains(handleUser.getId())){
-                                            userIds = userIds.equals("")?handleUser.getWxId():userIds+"|"+handleUser.getWxId();
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
+										        return BaseResponse.errorMsg("请配置处理项名称为"+handle.getName()+"的产值信息!");
+									        }
+								        }
+								        //消息推送
+								        BaseResponse wrapper = userMessageService.sendMessage(sampleHandle.getUserId(), "您有一条样品处理信息等待处理",entrust.getId(), SysUserMessage.MessageType.ENTRUST);
+								        if(wrapper.getCode() != 200){
+									        return wrapper;
+								        }
+
+								        SysUser handleUser = userService.getById(sampleHandle.getUserId());
+								        if(handleUser == null){
+									        return BaseResponse.errorMsg("样品处理人信息错误");
+								        }
+								        if(StringUtils.isNotBlank(handleUser.getWxId()) && !userIdList.contains(handleUser.getId())){
+									        userIds = userIds.equals("")?handleUser.getWxId():userIds+"|"+handleUser.getWxId();
+								        }
+							        }
+						        }
+					        }
+				        }
+			        }
+		        }
+	        }
+
+	        //生成委托单号
+	        String entrustCode = entrust.getProjectCode()+"-"+sampleList.get(0).getCementCode();
+	        entrust.setEntrustCode(entrustCode);
             entrust.setIsHandle(1)
                     .setStatus(3);
             logsService.saveLog(SysLogs.ObjType.ENTRUST_LOG, entrust.getId(), "同意委托修改", null);
@@ -1595,9 +1598,11 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             Set<String> parallelSet = new HashSet<>();
             for(SampleQuery sq : sampleQueryList){
                 if(sq.getIsParallel() >=2){
-                    integerLastCode = integerLastCode+1;
-                    lastCementCode = yearStr + "-" + commonService.getCementCode(integerLastCode);
-                    parallelSet.add(lastCementCode);
+                    for(int i=1; i<sq.getIsParallel(); i++){
+                        integerLastCode = integerLastCode+1;
+                        lastCementCode = yearStr + "-" + commonService.getCementCode(integerLastCode);
+                        parallelSet.add(lastCementCode);
+                    }
                 }
             }
 
@@ -2058,10 +2063,17 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
         if (query == null || query.getId() == null) {
             return BaseResponse.errorMsg("参数错误");
         }
+        if(query.getReturnReason().length()>100){
+            return BaseResponse.errorMsg("退回原因内容过长");
+        }
         SampleHandle sampleHandle = sampleHandleMapper.selectById(query.getId());
         if (sampleHandle == null) {
             return BaseResponse.errorMsg("信息错误");
         }
+
+
+
+
         if (sampleHandle.getStatus() != 1 && sampleHandle.getStatus() != 2) {
             return BaseResponse.errorMsg("状态错误");
         }
@@ -2219,7 +2231,11 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
         return BaseResponse.okMsg("已重新派发处理任务");
     }
 
+
+
     /**
+     * 样品处理进入到检测项表中
+     *
      * //判断改委托单的所有样品检测项对应的处理项对应的处理人，然后按照检测项存入检测项表，以便校核的时候可以校核结果
      * //只显示主样，因为样品处理只显示主样
      * @param entrustId
@@ -2293,6 +2309,43 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             }
         }
 
+        //根据检测项是否需要派发操作，判断委托单是否派发按钮，如果有一个检测项需要派发，则显示派发按钮，否则显示已经派发
+        //样品处理如果有一个检测项需要派发，则不改变已派发字段状态，否则改变为已派发状态
+
+        //未派发的样品
+        List<Sample> sampleList = sampleMapper.getNoDistributionList(entrustId);
+        if(sampleList != null && sampleList.size()>0){
+            Integer sampleNum = 0;
+            for(Sample sample : sampleList){
+                String teamIds = sample.getTeamIds();
+                Integer disNum = 0;
+                if (teamIds != null) {
+                    String[] teamIdS = teamIds.split("、");
+                    for (String teamId : teamIdS) {
+                        TeamVo teamVo = teamMapper.getDetail(Integer.valueOf(teamId));
+                        //如果本所编号不相等 则为副样，副样需要判断检测项是否需要平行样，如果不需要不用进行派发检测
+                        if(teamVo.getIsPf() == 1){
+                            disNum = disNum+1;
+                        }
+                    }
+                }
+                //如果disNum =0 说明该样品中没有需要派发的检测项，直接改样品的状态为已派发状态,样品状态改成已领用状态
+                if(disNum == 0){
+                    sample.setStatus(1).setIsDistribution(1);
+                    sampleMapper.updateById(sample);
+                }
+                sampleNum = sampleNum + disNum;
+            }
+            //sampleNum =0 说明该委托中没有需要派发的检测项，直接改样品的委托为已派发状态,委托单状态直接改成样品检测完成状态
+            if(sampleNum == 0){
+                Entrust entrust = entrustMapper.selectById(entrustId);
+                if(entrust != null){
+                    entrust.setStatus(6).setIsDistribution(1);
+                    entrustMapper.updateById(entrust);
+                }
+            }
+
+        }
     }
 
 
@@ -2809,6 +2862,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                 query.getDistributionid().size() <=0) {
             return BaseResponse.errorMsg("参数错误");
         }
+        if(query.getReturnReason().length()>100){
+            return BaseResponse.errorMsg("退回原因内容过长");
+        }
+
         //判断该委托单下的所有样品的处理 及 处理项是否全部完成
         Sample sample = sampleMapper.selectById(query.getSampleId());
         if (sample == null) {
@@ -3506,9 +3563,15 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                 ( query.getIsAgree() != 0 && query.getIsAgree() != 1 && query.getIsAgree() != 2)) {
             return BaseResponse.errorMsg("请选择正确按钮");
         }
-        if(query.getIsAgree() ==2  && StringUtils.isEmpty(query.getAuditReason())){
-            return BaseResponse.errorMsg("请填写退回原因");
+        if(query.getIsAgree() ==2){
+            if(StringUtils.isEmpty(query.getAuditReason())){
+                return BaseResponse.errorMsg("请填写退回原因");
+            }
+            if(query.getAuditReason().length()>100){
+                return BaseResponse.errorMsg("退回原因内容过长");
+            }
         }
+
         Entrust entrust = entrustMapper.selectById(query.getEntrustId());
         if (entrust == null) {
             return BaseResponse.errorMsg("信息错误");

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanConsumablesPurchaseServiceImpl.java

@@ -238,14 +238,6 @@ public class PlanConsumablesPurchaseServiceImpl extends ServiceImpl<PlanConsumab
         if (CollectionUtil.isEmpty(list)) {
             log.debug("没有找到数据!");
         }
-        list.forEach(arg -> {
-            if (StrUtil.isEmpty(arg.getRemark())) {
-                arg.setRemark("");
-            }
-            if (StrUtil.isEmpty(arg.getImplementation())) {
-                arg.setImplementation("");
-            }
-        });
         Map<String, Object> beanParams = new HashMap<>();
         beanParams.put("list", list);
         beanParams.put("fileNo","41-4051-2001");

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanEquipmentPurchaseServiceImpl.java

@@ -4,8 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.wise.sc.cement.business.entity.PlanEquipmentPurchase;
-import cn.wise.sc.cement.business.entity.SysRole;
-import cn.wise.sc.cement.business.entity.Team;
 import cn.wise.sc.cement.business.enumation.FileExt;
 import cn.wise.sc.cement.business.mapper.PlanEquipmentPurchaseMapper;
 import cn.wise.sc.cement.business.model.BaseResponse;
@@ -13,11 +11,7 @@ import cn.wise.sc.cement.business.model.LoginUser;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
 import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
-import cn.wise.sc.cement.business.model.query.RoleQuery;
-import cn.wise.sc.cement.business.model.query.TeamQuery;
 import cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo;
-import cn.wise.sc.cement.business.model.vo.TeamListVo;
-import cn.wise.sc.cement.business.model.vo.TeamVo;
 import cn.wise.sc.cement.business.service.IPlanEquipmentPurchaseService;
 import cn.wise.sc.cement.business.service.ISysUserService;
 import cn.wise.sc.cement.business.util.ExcelUtil;
@@ -31,7 +25,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -259,17 +252,6 @@ public class PlanEquipmentPurchaseServiceImpl extends ServiceImpl<PlanEquipmentP
             return;
         }
 
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
-        list.forEach(arg -> {
-            if (StrUtil.isEmpty(arg.getRemark())) {
-                arg.setRemark("");
-            }
-	        if (StrUtil.isEmpty(arg.getImplementation())) {
-		        arg.setImplementation("");
-	        }
-//            arg.setCreateTimeStr(arg.getCreateTime().format(dateTimeFormatter));
-	        arg.setPurchaseDateStr(arg.getPurchaseDate().format(dateTimeFormatter));
-        });
         Map<String, Object> params = new HashMap<>(5);
         params.put("list", list);
         params.put("fileNo", "41-4051-2001");

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanEquipmentRepairServiceImpl.java

@@ -249,16 +249,6 @@ public class PlanEquipmentRepairServiceImpl extends ServiceImpl<PlanEquipmentRep
 			return;
 		}
 
-//		DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
-		list.forEach(arg -> {
-			if (StrUtil.isEmpty(arg.getRemark())) {
-				arg.setRemark("");
-			}
-			if (StrUtil.isEmpty(arg.getImplementation())) {
-				arg.setImplementation("");
-			}
-//			arg.setCreateTimeStr(arg.getCreateTime().format(dateTimeFormatter));
-		});
 		Map<String, Object> params = new HashMap<>(5);
 		params.put("list", list);
 		params.put("fileNo", "41-4051-2001");

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanStandardPurchaseServiceImpl.java

@@ -239,16 +239,6 @@ public class PlanStandardPurchaseServiceImpl extends ServiceImpl<PlanStandardPur
 	    map.put("status", status);
 
         List<PlanStandardPurchaseVo> planStandardPurchaseVos = standardPurchaseMapper.wordList(map);
-
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
-        planStandardPurchaseVos.forEach(arg -> {
-	        System.out.println(arg.getPurchaseDate().format(dateTimeFormatter));
-            arg.setCreateTimeStr(arg.getPurchaseDate().format(dateTimeFormatter));
-
-            if (StrUtil.isEmpty(arg.getRemark())){
-                arg.setRemark("");
-            }
-        });
         if (CollectionUtil.isEmpty(planStandardPurchaseVos)) {
             log.debug("没找到数据!");
             return;

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/StandardServiceImpl.java

@@ -77,6 +77,8 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
     private WeiXinService weiXinService;
     @Value("${weixin.systemUrl}")
     private String systemUrl;
+    @Resource
+    private SupplierMapper supplierMapper;
 
 
     /**
@@ -179,12 +181,14 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
         }
         Standard standard = new Standard();
         BeanUtils.copyProperties(query, standard);
-        if(query.getEnterNum() != null && query.getUnitStock() != null){
+        //新增时 库存数量直接改为0
+        standard.setStockNum(new BigDecimal(0));
+       /* if(query.getEnterNum() != null && query.getUnitStock() != null){
             BigDecimal stockNum = new BigDecimal(query.getEnterNum()).multiply(query.getUnitStock());
             standard.setStockNum(stockNum);
         }else{
             standard.setStockNum(new BigDecimal(0));
-        }
+        }*/
         standard.setStatus(1)
                 .setCreateTime(LocalDateTime.now());
         standardMapper.insert(standard);
@@ -208,14 +212,14 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
             }
             standardValueService.saveBatch(standardValueList);
         }
-        //标样入库记录添加
+       /* //标样入库记录添加
         StandardEnter enter = new StandardEnter();
         enter.setStandardId(standard.getId())
                 .setUserId(loginUser.getId())
                 .setEnterNum(query.getEnterNum())  //入库数量  多少瓶
                 .setCreateTime(LocalDateTime.now())
                 .setRemark("新增标样");
-        standardEnterMapper.insert(enter);
+        standardEnterMapper.insert(enter);*/
         //保存标样材料信息
         Boolean ref = commonService.saveEntityEnclosure(EntityEnclosure.EntityType.STANDARD_SAMPLE, standard.getId(), query.getEnclosureQueryList());
         if (!ref) {
@@ -246,10 +250,10 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
         }
         Standard standard = new Standard();
         BeanUtils.copyProperties(query, standard);
-        if(query.getEnterNum() != null && query.getUnitStock() != null){
+        /*if(query.getEnterNum() != null && query.getUnitStock() != null){
             BigDecimal stockNum = new BigDecimal(query.getEnterNum()).multiply(query.getUnitStock());
             standard.setStockNum(stockNum);
-        }
+        }*/
         standardMapper.updateById(standard);
         //添加标准值
         if (query.getStandardValueQueryList() != null && query.getStandardValueQueryList().size() > 0) {
@@ -313,8 +317,16 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
         if (standard == null) {
             return BaseResponse.errorMsg("信息错误!");
         }
+
         StandardVo standardVo = new StandardVo();
         BeanUtils.copyProperties(standard, standardVo);
+        Supplier supplier = supplierMapper.selectById(standard.getSupplierId());
+        if(supplier != null){
+            standardVo.setSupplierName(supplier.getName());
+        }
+
+
+
         List<EntityEnclosure> entityEnclosureList = commonService.getEnclosureList
                 (EntityEnclosure.EntityType.STANDARD_SAMPLE, standard.getId());
 
@@ -351,16 +363,19 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
         if (standard == null) {
             return BaseResponse.errorMsg("数据错误!");
         }
-        StandardEnter enter = new StandardEnter();
-        enter.setStandardId(standard.getId())
-                .setUserId(userService.getLoginUser().getId())
-                .setEnterNum(query.getEnterNum())
-                .setCreateTime(LocalDateTime.now())
-                .setRemark(query.getRemark());
+        if(query.getEnterNum() != null){
+            BigDecimal enterNums = standard.getUnitStock().multiply(query.getEnterNum());
+            StandardEnter enter = new StandardEnter();
+            enter.setStandardId(standard.getId())
+                    .setUserId(userService.getLoginUser().getId())
+                    .setEnterNum(enterNums)
+                    .setCreateTime(LocalDateTime.now())
+                    .setRemark(query.getRemark());
+            standardEnterMapper.insert(enter);
+            standard.setStockNum(standard.getStockNum().add(enter.getEnterNum()));
+            standardMapper.updateById(standard);
+        }
 
-        standardEnterMapper.insert(enter);
-        standard.setStockNum(standard.getStockNum().add(standard.getUnitStock().multiply(new BigDecimal(query.getEnterNum()))));
-        standardMapper.updateById(standard);
         return BaseResponse.okData("新增入库完成");
     }
 
@@ -380,15 +395,18 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
         if (standard == null) {
             return BaseResponse.errorMsg("数据错误!");
         }
-        StandardOut out = new StandardOut();
-        out.setStandardId(standard.getId())
-                .setUserId(userService.getLoginUser().getId())
-                .setCollectNum(query.getOutNum())
-                .setCreateTime(LocalDateTime.now())
-                .setRemark(query.getRemark());
-        standardOutMapper.insert(out);
-        standard.setStockNum(standard.getStockNum().subtract(out.getCollectNum()));
-        standardMapper.updateById(standard);
+        if(query.getOutNum() != null){
+            StandardOut out = new StandardOut();
+            out.setStandardId(standard.getId())
+                    .setUserId(userService.getLoginUser().getId())
+                    .setCollectNum(query.getOutNum())
+                    .setCreateTime(LocalDateTime.now())
+                    .setRemark(query.getRemark());
+            standardOutMapper.insert(out);
+            standard.setStockNum(standard.getStockNum().subtract(out.getCollectNum()));
+            standardMapper.updateById(standard);
+        }
+
         return BaseResponse.okData("领用出库完成");
     }
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SupplierServiceImpl.java

@@ -177,30 +177,53 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 		if(suppliernclosure == null){
 			return BaseResponse.errorMsg("附件信息错误");
 		}
+		supplierEnclosureMapper.deleteById(id);
+		return BaseResponse.okData("删除成功");
+	}
+
+
+
+
+	/**
+	 * 删除供应商
+	 * @param id
+	 * @return
+	 */
+	@Transactional
+	@Override
+	public BaseResponse<String> deleteSupplier(Integer id) {
+		if(id == null){
+			return BaseResponse.errorMsg("参数错误");
+		}
+		Supplier supplier = supplierMapper.selectById(id);
+		if(supplier == null){
+			return BaseResponse.errorMsg("信息错误");
+		}
 		QueryWrapper<Standard> standardQueryWrapper = new QueryWrapper<>();
-		standardQueryWrapper.eq("supplier_id",suppliernclosure.getId());
+		standardQueryWrapper.eq("supplier_id",supplier.getId());
 		Integer standardCounts = standardMapper.selectCount(standardQueryWrapper);
 		if(standardCounts > 0 ){
 			return BaseResponse.errorMsg("有"+standardCounts+"个标样正在使用");
 		}
 		QueryWrapper<Equipment> equipmentQueryWrapper = new QueryWrapper<>();
-		equipmentQueryWrapper.eq("supplier_id",suppliernclosure.getId());
+		equipmentQueryWrapper.eq("supplier_id",supplier.getId());
 		Integer equipmentCounts = equipmentMapper.selectCount(equipmentQueryWrapper);
 		if(equipmentCounts > 0 ){
 			return BaseResponse.errorMsg("有"+equipmentCounts+"个设备正在使用");
 		}
 		QueryWrapper<Consumables> consumablesQueryWrapper = new QueryWrapper<>();
-		consumablesQueryWrapper.eq("supplier_id",suppliernclosure.getId());
+		consumablesQueryWrapper.eq("supplier_id",supplier.getId());
 		Integer consumablesCounts = consumablesMapper.selectCount(consumablesQueryWrapper);
 		if(consumablesCounts > 0 ){
 			return BaseResponse.errorMsg("有"+consumablesCounts+"个消耗品正在使用");
 		}
-		supplierEnclosureMapper.deleteById(id);
-		return BaseResponse.okData("附件信息删除成功");
+		supplierMapper.deleteById(id);
+		return BaseResponse.okData("删除成功");
 	}
 
 
 
 
 
+
 }