成品粮油下的数量管理添加新增功能

src/main/java/com/chinaitop/depot/product/controller/StorageProductFcbgzController.java

@@ -127,11 +127,28 @@ public class StorageProductFcbgzController {
     }
 
     /**
+     * 新增用到的仓房下拉
+     * @param orgId
+     * @return
+     */
+    @RequestMapping(value = "/getProductHouse" ,produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="仓房下拉", notes = "新增用到的仓房下拉")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query")
+    })
+    public List<Map<String,Object>> getProductHouse(String orgId){
+        Map<String,Object> map = new HashMap<String, Object>();
+        map.put("orgId",orgId);
+        List<Map<String,Object>> list = storageProductFcbgzService.getProductHouse(map);
+        return ParameterUtil.slashCapitals(list);
+    }
+
+    /**
      * 新增
      * @param productJson
      * @return
      */
-    @RequestMapping(value = "saveProduct" ,produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @RequestMapping(value = "/saveProduct" ,produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value="新增数据", notes = "新增数据")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "productJson", value = "JSON数据对象", paramType = "form"),
@@ -144,30 +161,32 @@ public class StorageProductFcbgzController {
         //如果是提交，则直接设置状态
         if(ParameterUtil.isequal("typeSubmit",typeState)){
             storageProductFcbgz.setDeleteState("2");
+        }else if(ParameterUtil.isequal("numberData",typeState)){
+            storageProductFcbgz.setDeleteState("3");//库存数量新增方法
         }else {
             storageProductFcbgz.setDeleteState("1");
         }
-        if(ParameterUtil.isnull(storageProductFcbgz.getId())){
-            if(ParameterUtil.isnull(storageProductFcbgz.getStorageQuantity()))
-                storageProductFcbgz.setStorageQuantity("0");
-            if(ParameterUtil.isnull(storageProductFcbgz.getOutboundQuantity()))
-                storageProductFcbgz.setOutboundQuantity("0");
 
-            Integer inventory = Integer.parseInt(storageProductFcbgz.getStorageQuantity()) - Integer.parseInt(storageProductFcbgz.getOutboundQuantity());
-            storageProductFcbgz.setInventoryQuantity(inventory.toString());
+        if(ParameterUtil.isnull(storageProductFcbgz.getStorageQuantity()))
+            storageProductFcbgz.setStorageQuantity("0");
+        if(ParameterUtil.isnull(storageProductFcbgz.getOutboundQuantity()))
+            storageProductFcbgz.setOutboundQuantity("0");
+
+        if(ParameterUtil.isnull(storageProductFcbgz.getId())){
+            if(!ParameterUtil.isequal("numberData",typeState)) {
+                Integer inventory = Integer.parseInt(storageProductFcbgz.getStorageQuantity()) - Integer.parseInt(storageProductFcbgz.getOutboundQuantity());
+                storageProductFcbgz.setInventoryQuantity(inventory.toString());
+            }
 
             storageProductFcbgz.setOrgId(orgId);
             storageProductFcbgz.setId(ParameterUtil.getCode());
             storageProductFcbgz.setCreateTime(new Date());
             storageProductFcbgzService.insert(storageProductFcbgz);
         }else{
-            if(ParameterUtil.isnull(storageProductFcbgz.getStorageQuantity()))
-                storageProductFcbgz.setStorageQuantity("0");
-            if(ParameterUtil.isnull(storageProductFcbgz.getOutboundQuantity()))
-                storageProductFcbgz.setOutboundQuantity("0");
-
-            Integer inventory = Integer.parseInt(storageProductFcbgz.getStorageQuantity()) - Integer.parseInt(storageProductFcbgz.getOutboundQuantity());
-            storageProductFcbgz.setInventoryQuantity(inventory.toString());
+            if(!ParameterUtil.isequal("numberData",typeState)) {
+                Integer inventory = Integer.parseInt(storageProductFcbgz.getStorageQuantity()) - Integer.parseInt(storageProductFcbgz.getOutboundQuantity());
+                storageProductFcbgz.setInventoryQuantity(inventory.toString());
+            }
 
             storageProductFcbgzService.update(storageProductFcbgz);
         }
@@ -190,6 +209,26 @@ public class StorageProductFcbgzController {
     }
 
     /**
+     * 获取数量详情
+     * @return
+     */
+    @RequestMapping(value = "/getNumberEdit" ,produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="获取数量详情", notes = "获取数量详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "orgId", paramType = "query"),
+            @ApiImplicitParam(name = "houseId", value = "houseId", paramType = "query")
+    })
+    public StorageProductFcbgz getNumberEdit(String orgId, String houseId){
+        StorageProductFcbgzExample storageProductFcbgzExample = new StorageProductFcbgzExample();
+        StorageProductFcbgzExample.Criteria criteria = storageProductFcbgzExample.createCriteria();
+        criteria.andOrgIdEqualTo(Integer.parseInt(orgId));
+        criteria.andHouseIdEqualTo(houseId);
+        criteria.andDeleteStateEqualTo("3");
+        List<StorageProductFcbgz> storageProductFcbgz = storageProductFcbgzService.getlist(storageProductFcbgzExample);
+        return storageProductFcbgz.get(0);
+    }
+
+    /**
      * 移除
      * @param id
      * @return

src/main/java/com/chinaitop/depot/product/mapper/StorageProductFcbgzMapper.java

@@ -31,4 +31,5 @@ public interface StorageProductFcbgzMapper {
     int updateByPrimaryKey(StorageProductFcbgz record);
 
     List<Map<String,Object>> getNumberList(Map<String,Object> map);
+    List<Map<String,Object>> getProductHouse(Map<String,Object> map);
 }

src/main/java/com/chinaitop/depot/product/mapper/StorageProductFcbgzMapper.xml

@@ -570,10 +570,11 @@
     lspz,
     nature,
     levels,
-    sum(inventory_quantity) inventoryquantity
+    max(delete_state) over (partition by house_id order by delete_state desc) AS deletestate,
+    sum(inventory_quantity) over (partition by house_id order by house_id) inventoryquantity
     FROM
     storage_product_fcbgz
-    WHERE delete_state = 2
+    WHERE delete_state <> 1
     <if test="orgId != null">
       AND org_id = #{orgId}
     </if>
@@ -588,10 +589,33 @@
     warehouse_id,
     lspz,
     nature,
-    levels
-    order by to_number(house_id)
+    levels,
+    delete_state,
+    inventory_quantity
     ) a
     WHERE a.inventoryquantity &lt;&gt; 0 AND
     a.rn = 1
   </select>
+
+  <select id="getProductHouse" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT
+        house.*
+    FROM
+        basic_storehouse house
+    LEFT JOIN storage_product_fcbgz fcbgz ON house.storehouse_id = fcbgz.house_id
+    WHERE
+        house.org_id = #{orgId}
+    AND house.storehouse_id NOT IN (
+        SELECT
+            house_id
+        FROM
+            storage_product_fcbgz
+        WHERE
+            delete_state = 3
+    )
+    AND house.del_flag = 1
+    AND house.library_type = 0
+    ORDER BY
+        house.storehouse_id ASC
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/product/service/StorageProductFcbgzService.java

@@ -19,6 +19,8 @@ public interface StorageProductFcbgzService {
 
     StorageProductFcbgz getProductById(String id);
 
+    List<Map<String,Object>> getProductHouse(Map<String,Object> map);
+
     void insert(StorageProductFcbgz storageProductFcbgz);
 
     void update(StorageProductFcbgz storageProductFcbgz);

src/main/java/com/chinaitop/depot/product/service/impl/StorageProductFcbgzServiceImpl.java

@@ -28,6 +28,10 @@ public class StorageProductFcbgzServiceImpl implements StorageProductFcbgzServic
     public List<Map<String,Object>> getNumberList(Map<String,Object> map) {
         return storageProductFcbgzMapper.getNumberList(map);
     }
+    @Override
+    public List<Map<String,Object>> getProductHouse(Map<String,Object> map) {
+        return storageProductFcbgzMapper.getProductHouse(map);
+    }
 
     @Override
     public void insert(StorageProductFcbgz storageProductFcbgz) {