Merge remote-tracking branch 'origin/master'

src/main/java/com/gaotao/modules/notify/controller/IssureNotifyController.java

@@ -153,6 +153,16 @@ public class IssureNotifyController {
         return R.ok();
     }
 
+    @PostMapping(value="/updateMaterialDetail")
+    @ResponseBody
+    public R updateMaterialDetail(@RequestBody SOIssueNotifyOrderMaterialList data) {
+        int i = issureNotifyService.updateMaterialDetail(data);
+        if(i >0){
+            return R.ok();
+        }
+        return R.error("修改失败");
+    }
+
     /**
      * @Description TODO
      * @Title deleteNotifySOS

src/main/java/com/gaotao/modules/notify/mapper/IssureNotifyMapper.java

@@ -167,4 +167,6 @@ public interface IssureNotifyMapper extends BaseMapper<SOIssueNotifyHeader> {
     IPage<SOIssueNotifyHeader> searchNoOrderNotifyHeader(Page<SOIssueNotifyHeader> page, @Param("data") ShipmentIssueDto data);
 
     List<SOIssueNotifyOrderList> getNotifyNoOrderDetailByType(SOIssueNotifyOrderList data);
+
+    int updateMaterialDetail(SOIssueNotifyOrderMaterialList data);
 }

src/main/java/com/gaotao/modules/notify/service/IssureNotifyService.java

@@ -180,4 +180,6 @@ public interface IssureNotifyService {
     List<SOIssueNotifyOrderList> getNotifyNoOrderDetailByType(SOIssueNotifyOrderList data)throws Exception;
 
     List<ImportPartAttrVo> uploadNoorderNotifyExcel(MultipartFile file, String site, String notifyNo)throws Exception;
+
+    int updateMaterialDetail(SOIssueNotifyOrderMaterialList data);
 }

src/main/java/com/gaotao/modules/notify/service/impl/IssureNotifyServiceImpl.java

@@ -1175,4 +1175,24 @@ public class IssureNotifyServiceImpl implements IssureNotifyService {
 
         return null;
     }
+
+    @Override
+    public int updateMaterialDetail(SOIssueNotifyOrderMaterialList data) {
+        QueryWrapper<SOIssueNotifyHeader> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site", data.getSite());
+        queryWrapper.eq("notify_no", data.getNotifyNo());
+        SOIssueNotifyHeader notifyHeader = issureNotifyMapper.selectOne(queryWrapper);
+
+        if (notifyHeader == null) {
+            throw new RuntimeException("申请单不存在");
+        }
+
+        // 判断是否已推送WCS，如果已推送则不允许取消下达
+        if (!"未推送".equals(notifyHeader.getPushWcsFlag())) {
+            throw new RuntimeException("申请单已推送WCS，不允许修改");
+        }
+        int i = issureNotifyMapper.updateMaterialDetail(data);
+
+        return i;
+    }
 }

src/main/resources/mapper/notify/IssureNotifyMapper.xml

@@ -488,4 +488,7 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
         LEFT JOIN area ar ON a.production_area = ar.area_id
         where a.site=#{site} and a.notify_no=#{notifyNo} and b.order_type='noorder'
     </select>
+    <update id="updateMaterialDetail">
+        update SOIssueNotifyOrderMaterialList set qty_to_issue = #{qtyToIssue} where notify_no = #{notifyNo} and site =#{site} and item_no=#{itemNo} and BOM_item_no=#{bOMItemNo}
+    </update>
 </mapper>