维修、保养 不能正常保存

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceKeepController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.device.model.StorageDeviceinput;
+import com.chinaitop.depot.device.model.StorageDeviceinputExample;
 import com.chinaitop.depot.device.model.StorageDevicekeep;
 import com.chinaitop.depot.device.model.StorageDevicekeepExample;
 import com.chinaitop.depot.device.service.StorageDeviceInputService;
@@ -179,8 +180,20 @@ public class StorageDeviceKeepController {
         	storageDevicekeep.setKeepStatus(1);
         	deviceKeepService.save(storageDevicekeep);
         	//根据设备编号获取入库表的改设备信息
+        	StorageDeviceinputExample storageDeviceinputExample=new StorageDeviceinputExample();
+        	StorageDeviceinputExample.Criteria criteria=storageDeviceinputExample.createCriteria();
+        	if(ParameterUtil.isnotnull(storageDevicekeep.getInputId())){
+        		criteria.andIdEqualTo(storageDevicekeep.getInputId());
+        	}
+            List<StorageDeviceinput> list = deviceInputService.queryByDevice(storageDeviceinputExample);
+            if(list.size()>0){
+            	modelMap.put("deviceTypeId", list.get(0).getDeviceType());
+            	modelMap.put("shelfId", list.get(0).getStorageRack());
+            }
         	modelMap.put("number", storageDevicekeep.getNumber());
         	modelMap.put("model", storageDevicekeep.getModel());
+        	modelMap.put("deviceName", storageDevicekeep.getDeviceName());
+        	modelMap.put("orgId", storageDevicekeep.getOrgId());
         	List<StorageDeviceinput> inputList=deviceInputService.getUseCount(modelMap);
         	inputList.get(0).setStatus(2);//保养状态
         	inputList.get(0).setUseCount(inputList.get(0).getUseCount()-1);//数量减少

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceRepairController.java

@@ -91,6 +91,8 @@ public class StorageDeviceRepairController {
         	storageDevicerepair.setRepairStatus(1);//改变维修表中的状态
         	deviceRepairService.save(storageDevicerepair);
         	//入库表中的状态改变  数量改变
+        	modelMap.put("deviceName", storageDevicerepair.getDeviceName());
+        	modelMap.put("orgId", storageDevicerepair.getOrgId());
         	modelMap.put("number", storageDevicerepair.getNumber());
         	modelMap.put("model", storageDevicerepair.getModel());
         	List<StorageDeviceinput> inputList=deviceInputService.getUseCount(modelMap);//查询入库表的该信息

src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.xml

@@ -612,11 +612,13 @@
    <select id="getUseCount" parameterType="java.util.Map" resultMap="BaseResultMap">
 
    select <include refid="Base_Column_List" /> from storage_deviceinput where number=#{number} and model=#{model}
-    and device_type=#{deviceTypeId} and
-    device_name In (select enumId from basic_enum where  enumName=#{deviceName}) 
+     and device_name In (select enumId from basic_enum where  enumName=#{deviceName}) 
+    <if test="deviceTypeId != null">
+    and device_type=#{deviceTypeId}
+    </if> 
     <if test="shelfId != null">
     and storage_rack IN (select id  from basic_equipment_equipment_pool where shelf_id=#{shelfId})
-    </if> 
+    </if>
      and org_id=#{orgId};
 
   </select>