退料

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java

@@ -547,6 +547,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
 
         }
         List<BackApplyInfo> backApplyInfoList = receiveView(record);
+        List<String> maCodeList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(backApplyInfoList) && !CollectionUtils.isEmpty(useTypeTree)) {
             for (TypeTreeNode typeTreeNode : useTypeTree) {
                 for (BackApplyInfo applyInfo : backApplyInfoList) {
@@ -564,9 +565,12 @@ public class BackReceiveServiceImpl implements BackReceiveService {
                         if (!CollectionUtils.isEmpty(hgList)) {
                             if (StringUtils.isNotBlank(hgList.get(0).getMaCode())) {
                                 List<MaCodeDto> list = new ArrayList<>();
-
                                 applyInfo.setPassNum(hgList.size());
                                 for (BackApplyInfo info : hgList) {
+                                    if (!"16".equals(info.getMaStatus())) {
+                                        maCodeList.add(info.getMaCode());
+                                        continue;
+                                    }
                                     MaCodeDto maCodeDto = new MaCodeDto();
                                     maCodeDto.setMaId(info.getMaId());
                                     maCodeDto.setMaCode(info.getMaCode());
@@ -590,6 +594,10 @@ public class BackReceiveServiceImpl implements BackReceiveService {
                                 List<MaCodeDto> list = new ArrayList<>();
                                 applyInfo.setMaintenanceNum(wxList.size());
                                 for (BackApplyInfo info : wxList) {
+                                    if (!"16".equals(info.getMaStatus())) {
+                                        maCodeList.add(info.getMaCode());
+                                        continue;
+                                    }
                                     MaCodeDto maCodeDto = new MaCodeDto();
                                     maCodeDto.setMaId(info.getMaId());
                                     maCodeDto.setMaCode(info.getMaCode());
@@ -620,7 +628,24 @@ public class BackReceiveServiceImpl implements BackReceiveService {
             }
             backApplyInfo.setBackApplyDetails(backApplyInfoList);
         }
-        return AjaxResult.success(backApplyInfo);
+        AjaxResult ajaxResult = AjaxResult.success();
+        ajaxResult.put("data", backApplyInfo);
+        if (!CollectionUtils.isEmpty(maCodeList)) {
+            // 拼接消息内容
+            StringBuffer msgBuilder = new StringBuffer("您所选择到编码设备编号 +");
+            for (int i = 0; i < maCodeList.size(); i++) {
+                String code = maCodeList.get(i);
+                msgBuilder.append(code);
+                if (i < maCodeList.size() - 1) {
+                    msgBuilder.append(", ");
+                }
+            }
+            msgBuilder.append("+已被他人完成退料，请注意查看！");
+            String msg = msgBuilder.toString();
+            msg = msg.replaceAll("\n","");
+            ajaxResult.put("msg", msg);
+        }
+        return ajaxResult;
     }
 
     @Override

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java

@@ -14,6 +14,7 @@ import com.bonus.sgzb.base.mapper.MaMachineMapper;
 import com.bonus.sgzb.base.service.ISysConfigService;
 import com.bonus.sgzb.base.vo.MaLabelBindVO;
 import com.bonus.sgzb.common.core.constant.Constants;
+import com.bonus.sgzb.common.core.utils.DateUtils;
 import com.bonus.sgzb.common.core.utils.StringUtils;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.security.utils.SecurityUtils;
@@ -259,6 +260,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
             leaseOutDetailsMapper.updateLeaseApplyDetails(record);
         }
         if (res > 0) {
+            if (record.getCreateTime() == null) {
+                record.setCreateTime(DateUtils.getNowDate());
+            }
             // 插入领料出库明细表（lease_out_details）
             res = leaseOutDetailsMapper.insertSelective(record);
             if (res > 0) {

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java

@@ -195,6 +195,8 @@ public class BackApplyServiceImpl implements BackApplyService {
 //        List<BackApplyInfo> view = backApplyMapper.getView(bean);
 //        return getMaTypeDetails(view);
         List<BackApplyInfo> view = backApplyMapper.getBackCheckView(bean);
+        // 移出taskStatus等于39(未完成)，并且maStatus不等于16的数据
+        view.removeIf(item -> "39".equals(item.getTaskStatus()) && !"16".equals(item.getMaStatus()));
         return view;
     }
 
@@ -726,9 +728,9 @@ public class BackApplyServiceImpl implements BackApplyService {
         Long backApplyInfoId = 0L;
         try {
             //查看本次退料申请是否合法
-            if (!isBackApplyNumberCorrect(bean)) {
+            /*if (!isBackApplyNumberCorrect(bean)) {
                 return AjaxResult.error("已申请退料数量加上本次退料申请数量，超过领料出库数量，请重试!");
-            }
+            }*/
             //生成退料编码
             String code = genderBackCode();
             if (StringUtils.isEmpty(code)) {

sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml

@@ -254,7 +254,9 @@
            <if test="replaceTypeId!= null">
                replace_type_id,
            </if>
+           <if test="createTime!= null">
                create_time,
+           </if>
            update_time
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -300,7 +302,9 @@
            <if test="replaceTypeId!= null">
                #{replaceTypeId},
            </if>
-           NOW(),
+           <if test="createTime!= null">
+               #{createTime},
+           </if>
            NOW()
        </trim>
     </insert>

sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml

@@ -1214,7 +1214,7 @@
     mt.type_name typeModelName,
     mt2.type_name typeName,
     mm.ma_code maCode,
-    lod.create_time createTime,
+    lod.create_time outTime,
     lod.out_num outNum,
     su.nick_name userName
     FROM

sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml

@@ -1076,7 +1076,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bad.type_id as typeId,
         bad.back_num AS num,
         mm.ma_code AS maCode,
-        mt.unit_name AS unitNames
+        mt.unit_name AS unitNames,
+        mm.ma_status AS maStatus,
+        tt.task_status AS taskStatus
         FROM
         back_check_details bad
         LEFT JOIN back_apply_info bai ON bai.id = bad.parent_id