联讯物业系统后台
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
java110
2021-08-12 4dbf61c9189796ec46d39ac4b839cfc064e70411 
 service-store/src/main/java/com/java110/store/api/CollectionApi.java


@@ -19,10 +19,12 @@


import com.java110.utils.util.Assert;


import com.java110.utils.util.BeanConvertUtil;


import com.java110.utils.util.DateUtil;


import com.java110.utils.util.StringUtil;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.http.ResponseEntity;


import org.springframework.web.bind.annotation.*;




import java.math.BigDecimal;


import java.util.ArrayList;


import java.util.List;




@@ -82,11 +84,12 @@


        purchaseApplyPo.setCreateUserId(userId);


        purchaseApplyPo.setCreateUserName(userName);


        purchaseApplyPo.setWarehousingWay(PurchaseApplyDto.WAREHOUSING_TYPE_APPLY);


        purchaseApplyPo.setCommunityId(reqJson.getString("communityId"));


        JSONArray resourceStores = reqJson.getJSONArray("resourceStores");


        List<PurchaseApplyDetailPo> purchaseApplyDetailPos = new ArrayList<>();


        for (int resourceStoreIndex = 0; resourceStoreIndex < resourceStores.size(); resourceStoreIndex++) {


            JSONObject resourceStore = resourceStores.getJSONObject(resourceStoreIndex);


            resourceStore.put("originalStock",resourceStore.get("stock"));


            resourceStore.put("originalStock", resourceStore.get("stock"));


            PurchaseApplyDetailPo purchaseApplyDetailPo = BeanConvertUtil.covertBean(resourceStore, PurchaseApplyDetailPo.class);


            purchaseApplyDetailPo.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));


            purchaseApplyDetailPos.add(purchaseApplyDetailPo);


@@ -118,6 +121,7 @@


    }




    /**


     * 物品发放


     * {"resourceOuts":[],"applyOrderId":"152020071665420001","taskId":"237506","resOrderType":"20000",


     * "purchaseApplyDetailVo":[{"applyOrderId":"152020071665420001","id":"152020071690120002","price":"","quantity":"1",


     * "resCode":"002","resId":"852020070239060001","resName":"水性笔","stock":"2","purchaseQuantity":"2","purchaseRemark":""}]}


@@ -143,13 +147,12 @@




    /**


     * 物品直接出库


     *


     */


    @RequestMapping(value = "/goodsDelivery", method = RequestMethod.POST)


    public ResponseEntity<String> goodsDelivery(@RequestBody JSONObject reqJson,


                                                  @RequestHeader(value = "user-id") String userId,


                                                  @RequestHeader(value = "user-name") String userName,


                                                  @RequestHeader(value = "store-id") String storeId) {


                                                @RequestHeader(value = "user-id") String userId,


                                                @RequestHeader(value = "user-name") String userName,


                                                @RequestHeader(value = "store-id") String storeId) {


        Assert.hasKeyAndValue(reqJson, "resourceStores", "必填，请填写物品领用的物资");


        Assert.hasKeyAndValue(reqJson, "description", "必填，请填写采购申请说明");


        PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();


@@ -167,6 +170,7 @@


        purchaseApplyPo.setCreateUserName(userName);


        purchaseApplyPo.setWarehousingWay(PurchaseApplyDto.WAREHOUSING_TYPE_DIRECT);


        purchaseApplyPo.setDescription("直接出库操作");


        purchaseApplyPo.setCommunityId(reqJson.getString("communityId"));


        JSONArray resourceStores = reqJson.getJSONArray("resourceStores");


        List<PurchaseApplyDetailPo> purchaseApplyDetailPos = new ArrayList<>();


        for (int resourceStoreIndex = 0; resourceStoreIndex < resourceStores.size(); resourceStoreIndex++) {


@@ -175,14 +179,23 @@


            purchaseApplyDetailPo.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));


            purchaseApplyDetailPo.setQuantity(purchaseApplyDetailPo.getPurchaseQuantity());


            purchaseApplyDetailPo.setRemark("直接出库");


            purchaseApplyDetailPo.setOriginalStock(resourceStore.get("stock").toString());


            purchaseApplyDetailPo.setOriginalStock(resourceStore.getString("stock"));


            purchaseApplyDetailPos.add(purchaseApplyDetailPo);




            //调整总库存


            ResourceStorePo resourceStorePo = new ResourceStorePo();


            resourceStorePo.setResId(purchaseApplyDetailPo.getResId());


            resourceStorePo.setStock("-" + purchaseApplyDetailPo.getPurchaseQuantity());


            resourceStorePo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_OUT);


            //计算出库后的最小计量总数


            BigDecimal oldMiniStock = new BigDecimal(resourceStore.getString("miniStock")); //获取原先的最小计量总数


            BigDecimal oldMiniUnitStock = new BigDecimal(resourceStore.getString("miniUnitStock")); //获取最小计量单位数量


            BigDecimal nowQuantity = new BigDecimal(purchaseApplyDetailPo.getPurchaseQuantity()); //获取出库数量


            BigDecimal nowMiniStock = nowQuantity.multiply(oldMiniUnitStock); //计算当前出库的最小计量总数


            BigDecimal surplusMiniStock = oldMiniStock.subtract(nowMiniStock);


            if (surplusMiniStock.compareTo(BigDecimal.ZERO) == -1) {


                throw new IllegalArgumentException("物品库存已经不足，请确认物品库存！");


            }


            resourceStorePo.setMiniStock(String.valueOf(surplusMiniStock));


            resourceStoreInnerServiceSMOImpl.updateResourceStore(resourceStorePo);


            //查询资源


            ResourceStoreDto resourceStoreDto = new ResourceStoreDto();


@@ -191,6 +204,12 @@


            if (resourceStoreDtos == null || resourceStoreDtos.size() < 1) {


                continue;


            }


            //获取物品单位


            String unitCode = resourceStoreDtos.get(0).getUnitCode();


            //获取物品最小计量单位


            String miniUnitCode = resourceStoreDtos.get(0).getMiniUnitCode();


            //获取物品最小计量单位数量


            String miniUnitStock = resourceStoreDtos.get(0).getMiniUnitStock();


            //入库到个人仓库中


            UserStorehousePo userStorehousePo = new UserStorehousePo();


            userStorehousePo.setUsId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_usId));


@@ -206,11 +225,42 @@


            List<UserStorehouseDto> userStorehouseDtos = userStorehouseInnerServiceSMOImpl.queryUserStorehouses(userStorehouseDto);


            if (userStorehouseDtos == null || userStorehouseDtos.size() < 1) {


                userStorehousePo.setStock(purchaseApplyDetailPo.getPurchaseQuantity());


                if (!StringUtil.isEmpty(unitCode) && !StringUtil.isEmpty(miniUnitCode) && !StringUtil.isEmpty(miniUnitStock) && !unitCode.equals(miniUnitCode)) {


                    //获取领取数量


                    BigDecimal purchaseQuantity = new BigDecimal(purchaseApplyDetailPo.getPurchaseQuantity());


                    //计算个人物品最小计量总数


                    BigDecimal miniUnitStock1 = new BigDecimal(miniUnitStock);


                    BigDecimal quantity = purchaseQuantity.multiply(miniUnitStock1);


                    userStorehousePo.setMiniStock(String.valueOf(quantity));


                } else {


                    userStorehousePo.setMiniStock(purchaseApplyDetailPo.getPurchaseQuantity());


                }


                userStorehouseInnerServiceSMOImpl.saveUserStorehouses(userStorehousePo);


            } else {


                int total = Integer.parseInt(purchaseApplyDetailPo.getPurchaseQuantity()) + Integer.parseInt(userStorehouseDtos.get(0).getStock());


                //获取个人物品领用后的库存


                BigDecimal purchaseQuantity = new BigDecimal(purchaseApplyDetailPo.getPurchaseQuantity());


                BigDecimal stock1 = new BigDecimal(userStorehouseDtos.get(0).getStock());


                BigDecimal total = purchaseQuantity.add(stock1);


                userStorehousePo.setStock(total + "");


                userStorehousePo.setUsId(userStorehouseDtos.get(0).getUsId());


                if (!StringUtil.isEmpty(unitCode) && !StringUtil.isEmpty(miniUnitCode) && !StringUtil.isEmpty(miniUnitStock) && !unitCode.equals(miniUnitCode)) {


                    //获取本次领取数量


                    BigDecimal miniUnitStock1 = new BigDecimal(miniUnitStock);


                    //计算本次领取的个人物品最小计量总数


                    BigDecimal quantity = purchaseQuantity.multiply(miniUnitStock1);


                    BigDecimal miniStock = new BigDecimal(0);


                    //获取个人物品原先的最小计量总数


                    if (StringUtil.isEmpty(userStorehouseDtos.get(0).getMiniStock())) {


                        throw new IllegalArgumentException("信息错误，个人物品最小计量总数不能为空！");


                    } else {


                        miniStock = new BigDecimal(userStorehouseDtos.get(0).getMiniStock());


                    }


                    //计算领用后个人物品总的最小计量总数


                    BigDecimal miniQuantity = quantity.add(miniStock);


                    userStorehousePo.setMiniStock(String.valueOf(miniQuantity));


                } else {


                    userStorehousePo.setMiniStock(String.valueOf(total));


                }


                userStorehouseInnerServiceSMOImpl.updateUserStorehouses(userStorehousePo);


            }


        }