--部门物品分发

futian.liu

2023-11-23 5112320c542900d9e79bbc0938b195a43e3fc255

 consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java

@@ -5,11 +5,11 @@
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.LWhFormTransferGoodsInfoParam;
import com.consum.base.pojo.LWhFormTransferParam;
import com.consum.base.pojo.ProcureModelInfoDto;
import com.consum.base.pojo.UseRecordDto;
import com.consum.base.pojo.UseRecordSkuDto;
import com.consum.base.pojo.query.TransferQry;
import com.consum.base.pojo.request.LWhFormTransferParam;
import com.consum.base.pojo.response.FormTransferVO;
import com.consum.base.pojo.response.FromTransferTemplateInfoVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
@@ -146,42 +146,6 @@
                formTransferVO.setFromTransferTemplateInfoList(templateInfoList);

                result.add(formTransferVO);


                /*// 查询型号数量
                LWhProcureModel lWhProcureModel = new LWhProcureModel();
                Integer businessType = item.getBusinessType();
                // TODO 调拨=0 分发=1 退回=2
                switch (businessType) {
                    case 0:
                        lWhProcureModel.setBusinessType(2);
                        break;
                    case 1:
                        lWhProcureModel.setBusinessType(4);
                        break;
                }
                lWhProcureModel.setBusinessId(item.getId());
                List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel);
                List<LWhProcureModelVo> lWhProcureModelVoList = new ArrayList<>();
                if (!CollectionUtils.isEmpty(models)) {
                    models.forEach(model -> {
                        LWhProcureModelVo lWhProcureModelVo = new LWhProcureModelVo();
                        BeanUtils.copyProperties(model, lWhProcureModelVo);

                        Long baseGoodsModelsId = model.getBaseGoodsModelsId();
                        Long businessId = model.getBusinessId();
                        Long id = model.getId();
                        LWhProcureModelUser lWhFormTransferUser = new LWhProcureModelUser();
                        lWhFormTransferUser.setTransBusinessId(businessId);
                        lWhFormTransferUser.setWhProcureModelId(id);
                        lWhFormTransferUser.setBaseGoodsModelsId(baseGoodsModelsId);
                        List<LWhProcureModelUser> procureModelUserList = lWhProcureModelUserService.select(lWhFormTransferUser);
                        lWhProcureModelVo.setProcureModelUsersList(procureModelUserList);
                        lWhProcureModelVoList.add(lWhProcureModelVo);
                    });
                }
                formTransferExtend.setModels(lWhProcureModelVoList);
                newDatas.add(formTransferExtend);*/
            });
        }
        try {
@@ -327,12 +291,11 @@
        return ResponseValue.success(transferInfoDetailsVoGenericPager);
    }

    /**
     * 部门物品使用记录
     *
     * @param procureModelInfoDto
     * @return
     */

    @ApiOperation(value = "使用人修改", notes = "使用人修改")
    @ApiImplicitParams({
        @ApiImplicitParam(name = "procureModelInfoDto", value = "使用信息", required = true)
    })
    @PostMapping("/useInfo/update")
    public ResponseValue infoUpdate(@RequestBody List<ProcureModelInfoDto> procureModelInfoDto) {

@@ -385,6 +348,10 @@
     * @param transferOrderId
     * @return
     */
    @ApiOperation(value = "部门物品使用人记录", notes = "部门物品使用人记录")
    @ApiImplicitParams({
        @ApiImplicitParam(name = "transferOrderId", value = "调拨单id", required = true)
    })
    @GetMapping("/use/record")
    public ResponseValue useRecord(Long transferOrderId) {

@@ -394,6 +361,8 @@
        }
        LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
        lWhProcureModelUserRecord.setTransBusinessId(transferOrderId);
        String sql =
            "select * from l_wh_procure_model_user_record pmur inner join l_wh_procure_model_user pmu on pmur.TRANS_BUSINESS_ID = pmu.  " + transferOrderId;
        List<LWhProcureModelUserRecord> modelUserRecords = lWhProcureModelUserRecordService.select(lWhProcureModelUserRecord);

        List<UseRecordDto> result = Lists.newArrayList();
@@ -402,10 +371,10 @@
            UseRecordDto useRecordDto = new UseRecordDto();
            useRecordDto.setId(id);
            useRecordDto.setUpdateUserName(item.getOperatorName());
            useRecordDto.setUpdateTime(DateUtils.toShowDate(item.getDealTime()));
            useRecordDto.setUpdateTime(item.getDealTime());

            LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
            lWhProcureModelUser.setWhProcureModelId(id);
            lWhProcureModelUser.setProcureModelUserRecordId(id);
            List<LWhProcureModelUser> procureModelUserList = lWhProcureModelUserService.select(lWhProcureModelUser);

            List<UseRecordSkuDto> recordSkuDtoList = Lists.newArrayList();