设备编码入库

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java

@@ -28,8 +28,7 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo;
 @RestController
 @Api(value = "新购验收编号管理")
 @RequestMapping("/purchaseMacode")
-public class PurchaseMacodeInfoController extends BaseController
+public class PurchaseMacodeInfoController extends BaseController {
-{
     @Autowired
     private IPurchaseMacodeInfoService purchaseMacodeInfoService;
 
@@ -51,8 +50,7 @@ public class PurchaseMacodeInfoController extends BaseController
      */
     @ApiOperation(value = "导出新购验收编号管理列表")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, PurchaseMacodeInfo purchaseMacodeInfo)
+    public void export(HttpServletResponse response, PurchaseMacodeInfo purchaseMacodeInfo) {
-    {
         List<PurchaseMacodeInfo> list = purchaseMacodeInfoService.selectPurchaseMacodeInfoList(purchaseMacodeInfo);
         ExcelUtil<PurchaseMacodeInfo> util = new ExcelUtil<PurchaseMacodeInfo>(PurchaseMacodeInfo.class);
         util.exportExcel(response, list, "新购验收编号管理数据");
@@ -63,8 +61,7 @@ public class PurchaseMacodeInfoController extends BaseController
      */
     @ApiOperation(value = "获取新购验收编号管理详细信息")
     @GetMapping(value = "/getInfo")
-    public AjaxResult getInfo(PurchaseMacodeInfo purchaseMacodeInfo)
+    public AjaxResult getInfo(PurchaseMacodeInfo purchaseMacodeInfo) {
-    {
         return success(purchaseMacodeInfoService.selectPurchaseMacodeInfo(purchaseMacodeInfo));
     }
 
@@ -73,8 +70,7 @@ public class PurchaseMacodeInfoController extends BaseController
      */
     @ApiOperation(value = "新购入库清单明细")
     @GetMapping(value = "/putinDetails")
-    public TableDataInfo putinDetails(PurchaseMacodeInfo purchaseMacodeInfo)
+    public TableDataInfo putinDetails(PurchaseMacodeInfo purchaseMacodeInfo) {
-    {
         startPage();
         return getDataTable(purchaseMacodeInfoService.selectPutinDetails(purchaseMacodeInfo));
     }
@@ -84,8 +80,7 @@ public class PurchaseMacodeInfoController extends BaseController
      */
     @ApiOperation(value = "入库单")
     @GetMapping(value = "/warehousingEntry")
-    public AjaxResult warehousingEntry(PurchaseMacodeInfo purchaseMacodeInfo)
+    public AjaxResult warehousingEntry(PurchaseMacodeInfo purchaseMacodeInfo) {
-    {
         return success(purchaseMacodeInfoService.warehousingEntry(purchaseMacodeInfo));
     }
 
@@ -113,7 +108,13 @@ public class PurchaseMacodeInfoController extends BaseController
     @ApiOperation(value = "修改编码管理的入库状态")
     @PutMapping("/manageStatus")
     public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO) throws Exception {
-        return toAjax(purchaseMacodeInfoService.modifyManageStatus(maInputVO));
+        int res = purchaseMacodeInfoService.modifyManageStatus(maInputVO);
+        if (res == 0) {
+            return AjaxResult.error("入库单存在未绑定编码或无法绑定编码的设备，出库失败");
+        } else {
+            return AjaxResult.success();
+        }
+
     }
 
     /**
@@ -121,8 +122,7 @@ public class PurchaseMacodeInfoController extends BaseController
      */
     @ApiOperation(value = "删除新购验收编号管理")
     @DeleteMapping("/{maCode}")
-    public AjaxResult remove(@PathVariable String maCode)
+    public AjaxResult remove(@PathVariable String maCode) {
-    {
         return toAjax(purchaseMacodeInfoService.deletePurchaseMacodeInfoByMaCode(maCode));
     }
 }

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

@@ -83,7 +83,7 @@ public interface IPurchaseMacodeInfoService
      * @param maInputVO
      * @return
      */
-    int modifyManageStatus(MaInputVO maInputVO);
+    int modifyManageStatus(MaInputVO maInputVO) throws Exception;
 
     /**
      * 删除新购验收编号管理

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

@@ -18,6 +18,7 @@ import com.bonus.sgzb.common.core.utils.DateUtils;
 import com.bonus.sgzb.material.vo.EquipmentNumberVO;
 import com.bonus.sgzb.material.vo.GlobalContants;
 import com.bonus.sgzb.material.vo.MaInputVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -44,6 +45,9 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
     @Resource
     private PurchaseCheckDetailsMapper checkDetailsMapper;
 
+    @Autowired
+    private IPurchaseMacodeInfoService purchaseMacodeInfoService;
+
 
     /**
      * 查询新购验收编号管理
@@ -267,7 +271,18 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
      * @return 结果
      */
     @Override
-    public int modifyManageStatus(MaInputVO maInputVO) {
+    public int modifyManageStatus(MaInputVO maInputVO) throws Exception {
+        if (maInputVO.getInputRecordList().get(0) != null && maInputVO.getInputRecordList().get(0).getTaskId() != null) {
+            Long taskId = maInputVO.getInputRecordList().get(0).getTaskId();
+            PurchaseMacodeInfo purchaseMacodeInfo = new PurchaseMacodeInfo();
+            purchaseMacodeInfo.setTaskId(taskId);
+            List<PurchaseMacodeInfo> purchaseMacodeInfos = purchaseMacodeInfoService.selectPutinDetails(purchaseMacodeInfo);
+            for (PurchaseMacodeInfo macodeInfo : purchaseMacodeInfos) {
+                if (macodeInfo.getMaCode() == null) {
+                    return 0;
+                }
+            }
+        }
         Long taskId = maInputVO.getTaskId();
         String checkResult = maInputVO.getCheckResult();
         List<MaInputRecord> inputRecordList = maInputVO.getInputRecordList();
@@ -323,7 +338,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
 
                 // 新增入库记录
                 purchaseMacodeInfoMapper.insertMaInputRecord(maInputRecord);
-            }else {
+            } else {
                 //删除ma_machine表
                 purchaseMacodeInfoMapper.deleteMaMachineInfoByMaId(maInputRecord.getMaId());
                 //删除ma_machine_label表
@@ -331,9 +346,9 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
                 //删除ma_label_bind表
                 purchaseMacodeInfoMapper.deleteMaLabelBindByMaId(maInputRecord.getMaId());
                 //修改purchase_macode_info表
-                purchaseMacodeInfoMapper.updatetePurchaseMaCodeInfoByMaCodeAndTaskIdAndTypeId(taskId,typeId,maInputRecord.getMaCode());
+                purchaseMacodeInfoMapper.updatetePurchaseMaCodeInfoByMaCodeAndTaskIdAndTypeId(taskId, typeId, maInputRecord.getMaCode());
                 //修改purchase_check_details表
-                checkDetailsMapper.updatePurchaseCheckDetailsByTaskId(taskId,typeId);
+                checkDetailsMapper.updatePurchaseCheckDetailsByTaskId(taskId, typeId);
             }
         }