diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessChangeTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessChangeTypeController.java index 4969888b..43a02222 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessChangeTypeController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessChangeTypeController.java @@ -1,16 +1,22 @@ package com.glxp.api.admin.controller.basic; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.constant.ConstantType; import com.glxp.api.admin.entity.basic.BussinessChangeTypeEntity; import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.api.admin.entity.basic.BussinessTypeEntity; +import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.admin.req.basic.BusTypeChangeFilterRequest; import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; +import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.service.basic.BussinessChangeTypeService; import com.glxp.api.admin.service.basic.BussinessLocalTypeService; import com.glxp.api.admin.service.basic.BussinessTypeService; +import com.glxp.api.admin.service.inventory.InvSubWarehouseService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -34,6 +40,8 @@ public class BussinessChangeTypeController { private BussinessTypeService bussinessTypeService; @Resource private BussinessLocalTypeService bussinessLocalTypeService; + @Resource + private InvSubWarehouseService invSubWarehouseService; @AuthRuleAnnotation("") @GetMapping("/spms/bussinessChangeType/filter") @@ -57,34 +65,34 @@ public class BussinessChangeTypeController { ) { if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) { BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity(); - bussinessChangeTypeEntity1.setIntro("出库自动补\"供应商入库单\""); +// bussinessChangeTypeEntity1.setIntro("出库自动补\"供应商入库单\""); bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_IN); bussinessChangeTypeEntity1.setIndex(1); bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction()); bussinessChangeTypeEntity1.setBeforeTime(1); bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1); - BussinessChangeTypeEntity bussinessChangeTypeEntity2 = new BussinessChangeTypeEntity(); - bussinessChangeTypeEntity2.setIntro("出库自动补\"调拨入库单\""); - bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_INNOR_NORMAL_IN); - bussinessChangeTypeEntity2.setIndex(1); - bussinessChangeTypeEntity2.setAction(bussinessTypeFilterRequest.getAction()); - bussinessChangeTypeEntity1.setBeforeTime(1); - bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity2); - BussinessChangeTypeEntity bussinessChangeTypeEntity3 = new BussinessChangeTypeEntity(); - bussinessChangeTypeEntity3.setIntro("出库自动补\"寄售转入单\""); - bussinessChangeTypeEntity3.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_ADV_IN); - bussinessChangeTypeEntity3.setIndex(2); - bussinessChangeTypeEntity3.setAction(bussinessTypeFilterRequest.getAction()); - bussinessChangeTypeEntity1.setBeforeTime(1); - bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity3); - bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction()); +// BussinessChangeTypeEntity bussinessChangeTypeEntity2 = new BussinessChangeTypeEntity(); +// bussinessChangeTypeEntity2.setIntro("出库自动补\"调拨入库单\""); +// bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_INNOR_NORMAL_IN); +// bussinessChangeTypeEntity2.setIndex(1); +// bussinessChangeTypeEntity1.setBeforeTime(1); +// bussinessChangeTypeEntity2.setAction(bussinessTypeFilterRequest.getAction()); +// bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity2); +// BussinessChangeTypeEntity bussinessChangeTypeEntity3 = new BussinessChangeTypeEntity(); +// bussinessChangeTypeEntity3.setIntro("出库自动补\"寄售转入单\""); +// bussinessChangeTypeEntity3.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_ADV_IN); +// bussinessChangeTypeEntity3.setIndex(2); +// bussinessChangeTypeEntity1.setBeforeTime(1); +// bussinessChangeTypeEntity3.setAction(bussinessTypeFilterRequest.getAction()); +// bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity3); +// bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction()); } else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && bussinessTypeEntity.isAdvanceType()) { BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity(); - bussinessChangeTypeEntity1.setIntro("出库自动补\"寄售入库单\""); +// bussinessChangeTypeEntity1.setIntro("出库自动补\"寄售入库单\""); bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_ADVANCE_IN); bussinessChangeTypeEntity1.setIndex(1); - bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction()); bussinessChangeTypeEntity1.setBeforeTime(1); + bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction()); bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1); bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction()); } @@ -93,6 +101,24 @@ public class BussinessChangeTypeController { return ResultVOUtils.success(bussinessTypeEntities); } + + @AuthRuleAnnotation("") + @GetMapping("/spms/busTypeChange/filter") + public BaseResponse filterBusTypeChange(BusTypeChangeFilterRequest busTypeChangeFilterRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List bussinessTypeEntities = bussinessChangeTypeService.filterAll(busTypeChangeFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(bussinessTypeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(bussinessTypeEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") @PostMapping("/spms/bussinessChangeType/remove") public BaseResponse removeBussinessType(@RequestBody BussinessChangeTypeEntity deleteRequest, BindingResult bindingResult) { @@ -101,7 +127,10 @@ public class BussinessChangeTypeController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } String action = deleteRequest.getScAction(); - bussinessChangeTypeService.deleteByAction(action); + if (StrUtil.isEmpty(action)) { + bussinessChangeTypeService.deleteById(deleteRequest.getId() + ""); + } else + bussinessChangeTypeService.deleteByAction(action); return ResultVOUtils.success("删除成功"); } @@ -131,8 +160,6 @@ public class BussinessChangeTypeController { BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findByAction(bussinessTypeEntity.getAction()); bussinessLocalTypeEntity.setUpdateTime(new Date()); bussinessLocalTypeService.updateBusLocalType(bussinessLocalTypeEntity); - - } else { ResultVOUtils.error(999, "参数错误"); } @@ -148,6 +175,14 @@ public class BussinessChangeTypeController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } if (bussinessTypeEntity != null) { + if (StrUtil.isNotEmpty(bussinessTypeEntity.getDefaultSubInv())) { + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.findByInvSubByCode(bussinessTypeEntity.getDefaultSubInv()); + bussinessTypeEntity.setDefaultInv(invSubWarehouseEntity.getParentId()); + } + if (StrUtil.isNotEmpty(bussinessTypeEntity.getLocSubInv())) { + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.findByInvSubByCode(bussinessTypeEntity.getLocSubInv()); + bussinessTypeEntity.setLocInv(invSubWarehouseEntity.getParentId()); + } bussinessChangeTypeService.insertBusChangeTypee(bussinessTypeEntity); } else { ResultVOUtils.error(999, "参数错误"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java index a50690a2..39b89ba6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java @@ -45,6 +45,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -171,10 +172,15 @@ public class UdiRelevanceController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List udiRelevanceResponses = null; - filterUdiInfoRequest.setDiType(1); - if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) { - UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode()); - filterUdiInfoRequest.setNameCode(udiEntity.getUdi()); + if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUnionCode())) { + filterUdiInfoRequest.setNameCode(filterUdiInfoRequest.getUnionCode()); + List temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + if (temps != null && temps.size() > 0) { + filterUdiInfoRequest.setUuid(temps.get(0).getUuid()); + filterUdiInfoRequest.setNameCode(null); + } + } else { + filterUdiInfoRequest.setDiType(1); } udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); @@ -286,15 +292,46 @@ public class UdiRelevanceController { @AuthRuleAnnotation("") @PostMapping("/udi/udirel/update") - public BaseResponse updateRelevanceEntity(@RequestBody UdiRelevanceEntity udiRelevanceEntity, BindingResult bindingResult) { + public BaseResponse updateRelevanceEntity(@RequestBody UdiRelevanceResponse udiRelevanceResponse, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + + + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceEntity); + udiRelevanceEntity.setId(udiRelevanceResponse.getId() + ""); String time = DateUtil.getDateTime(); udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setModifyTime(time); + if (udiRelevanceResponse.getIsUseDy() == 1) { + udiRelevanceEntity.setIsUseDy(true); + } else udiRelevanceEntity.setIsUseDy(false); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + + + UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); + udiInfoEntity.setSptm(udiRelevanceResponse.getSptm()); + udiInfoEntity.setYbbm(udiRelevanceResponse.getYbbm()); + udiInfoEntity.setMeasname(udiRelevanceResponse.getMeasname()); + udiInfoEntity.setManufactory(udiRelevanceResponse.getManufactory()); + udiInfoEntity.setCpms(udiRelevanceResponse.getCpms()); + udiInfoEntity.setPrice(udiRelevanceResponse.getPrice()); + udiInfoEntity.setSpmc(udiRelevanceResponse.getSpmc()); + udiInfoEntity.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1()); + udiInfoEntity.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2()); + udiInfoEntity.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3()); + udiInfoEntity.setBasicPrductRemak4(udiRelevanceResponse.getBasicPrductRemak4()); + udiInfoEntity.setBasicPrductRemak5(udiRelevanceResponse.getBasicPrductRemak5()); + udiInfoEntity.setBasicPrductRemak6(udiRelevanceResponse.getBasicPrductRemak6()); + udiInfoEntity.setBasicPrductRemak7(udiRelevanceResponse.getBasicPrductRemak7()); + udiInfoEntity.setBasicPrductRemak8(udiRelevanceResponse.getBasicPrductRemak8()); + if (StrUtil.isNotEmpty(udiRelevanceResponse.getOriginUuid())) { + udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI); + } + udiInfoEntity.setUuid(udiRelevanceResponse.getUuid()); + udiInfoService.updateUdiInfo(udiInfoEntity); return ResultVOUtils.success("更新成功"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java index 3f10c2dc..5d04acb6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java @@ -327,6 +327,7 @@ public class StockOrderDetailController { stockOrderDetailEntity.setManufactory(udiInfoEntity.getManufactory()); stockOrderDetailEntity.setMeasname(udiInfoEntity.getMeasname()); stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc()); + stockOrderDetailEntity.setSupName(udiInfoEntity.getCompanyName()); if (StrUtil.isNotEmpty(stockOrderIdsRequest.getZczbhhzbapzbh())) stockOrderDetailEntity.setZczbhhzbapzbh(stockOrderIdsRequest.getZczbhhzbapzbh()); else @@ -424,7 +425,6 @@ public class StockOrderDetailController { stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc()); stockOrderDetailEntity.setManufactory(udiInfoEntity.getManufactory()); stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh()); - stockOrderDetailService.insertStockOrderDetail(stockOrderDetailEntity); return ResultVOUtils.success(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java index 03716ef9..e521c436 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java @@ -70,13 +70,13 @@ public class CompanyProductRelevanceController { List temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); if (temps != null && temps.size() > 0) { companyProductRelevanceRequest.setUuid(temps.get(0).getUuid()); - companyProductRelevanceRequest.setNameCode(null); + companyProductRelevanceRequest.setNameCode(filterUdiInfoRequest.getNameCode()); companyProductRelevanceRequest.setUnionCode(null); } + } else { + companyProductRelevanceRequest.setDiType(1); } - List basicInstrumentMaintainRelevanceResponses = null; - companyProductRelevanceRequest.setDiType(1); basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java index f8ece894..8e5786a5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java @@ -96,7 +96,7 @@ public class InvSubWarehouseController { if(invSubWarehouseEntity!=null){ InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId()); filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode()); - filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getPcode()); + filterInvWarehouseRequest.setSuperiorPcode(invWarehouseEntity.getPcode()); filterInvWarehouseRequest.setCode(null); }else { return ResultVOUtils.error(999,"分库编号为空！"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java index d908a636..5c4edc54 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java @@ -150,7 +150,7 @@ public class PurApplyController { */ @RepeatSubmit() @PostMapping("/purchase/apply/auditOrder") - public BaseResponse auditOrder(@RequestBody PurApplyRequest purApplyRequest) { + public BaseResponse auditOrder(@RequestBody PurApplyResponse purApplyRequest) { Integer userId = customerService.getUserId(); @@ -162,19 +162,27 @@ public class PurApplyController { purApplyService.update(purApplyEntity); //审核通过后转换成采购计划单 - if (purApplyEntity.getStatus() == ConstantStatus.APPLY_AUDIT_ED && StrUtil.isNotEmpty(purApplyEntity.getTargetBillType())) { + if (purApplyEntity.getStatus() == ConstantStatus.APPLY_AUDIT_ED && purApplyRequest.isAudtoPlan()) { PurPlanEntity purPlanEntity = new PurPlanEntity(); String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd")); purPlanEntity.setBillNo(billNo); purPlanEntity.setBillDate(new Date()); - purPlanEntity.setStatus(ConstantStatus.APPLY_UN_AUDIT); - purPlanEntity.setLocStorageCode(purApplyEntity.getTargetInv()); - purPlanEntity.setInvWarehouseCode(purApplyEntity.getTargetSubInv()); - purPlanEntity.setBillType(purApplyEntity.getTargetBillType()); - purPlanEntity.setDeptCode(purApplyEntity.getDeptCode()); - purPlanEntity.setCreateBy(purApplyEntity.getAuditBy()); + purPlanEntity.setStatus(ConstantStatus.APPLY_DRAFT); +// purPlanEntity.setLocStorageCode(purApplyEntity.getTargetInv()); +// purPlanEntity.setInvWarehouseCode(purApplyEntity.getTargetSubInv()); + purPlanEntity.setBillType("purPlan"); +// purPlanEntity.setBillType(purApplyEntity.getTargetBillType()); +// purPlanEntity.setDeptCode(purApplyEntity.getDeptCode()); +// purPlanEntity.setCreateBy(purApplyEntity.getAuditBy()); purPlanEntity.setCreateTime(new Date()); purPlanEntity.setUpdateTime(new Date()); + purPlanEntity.setApplyBillNo(purApplyEntity.getBillNo()); + purPlanEntity.setApplyCreateBy(purApplyEntity.getCreateBy()); + purPlanEntity.setApplyRemark(purApplyEntity.getRemark()); + purPlanEntity.setApplyAuditBy(purApplyEntity.getAuditBy()); + purPlanEntity.setRemark("申购科室：" + purApplyRequest.getSubInvName() + + ";申购人：" + purApplyRequest.getCreateByName() + ";申购原因：" + purApplyRequest.getRemark()); + purPlanService.insert(purPlanEntity); List purApplyDetailEntities = purApplyDetailService.findByOrderId(purApplyEntity.getId() + ""); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java index f9fe23ae..abe8d12e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java @@ -173,9 +173,10 @@ public class PurPlanController { List purPlanDetailEntities = purPlanDetailService.findByOrderId(purApplyEntity.getId() + ""); - BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.findByAction(purApplyEntity.getBillType()); +// BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.findByAction(purApplyEntity.getBillType()); //转换成业务单据 - if (postPurPlanRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED && basicBusTypeChangeEntity != null && basicBusTypeChangeEntity.getTargetBusAction() != null) { + if (postPurPlanRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED + && StrUtil.isNotEmpty(purApplyEntity.getTargetSubInv()) && StrUtil.isNotEmpty(purApplyEntity.getTargetBillAction())) { if (CollUtil.isNotEmpty(purPlanDetailEntities)) { //1.根据供应商分组 @@ -191,12 +192,13 @@ public class PurPlanController { } } } - //2.生成业务单据 + String stockOrderNo = ";"; for (String supId : filterSupMaps.keySet()) { //2.构建业务单据 StockOrderEntity stockOrderEntity = new StockOrderEntity(); String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.BUS_ORDER, "yyyyMMdd")); + stockOrderNo = stockOrderNo + billNo; stockOrderEntity.setBillNo(billNo); stockOrderEntity.setSourceType(ConstantStatus.ST_APPLY_ADD); stockOrderEntity.setCorpId(supId); @@ -205,10 +207,11 @@ public class PurPlanController { stockOrderEntity.setCorpName(basicUnitMaintainEntity.getName()); stockOrderEntity.setBilldate(DateUtil.formatDateTime(new Date())); stockOrderEntity.setStatus(ConstantStatus.SORDER_ALLOC); - stockOrderEntity.setBillType(basicBusTypeChangeEntity.getTargetBusAction()); - stockOrderEntity.setInvWarehouseCode(purApplyEntity.getInvWarehouseCode()); - stockOrderEntity.setLocStorageCode(purApplyEntity.getLocStorageCode()); - stockOrderEntity.setDept(purApplyEntity.getDeptCode()); + stockOrderEntity.setBillType(purApplyEntity.getTargetBillAction()); + stockOrderEntity.setInvWarehouseCode(purApplyEntity.getTargetSubInv()); + stockOrderEntity.setLocStorageCode(purApplyEntity.getTargetInv()); + stockOrderEntity.setCreateUser(userId); +// stockOrderEntity.setDept(purApplyEntity.getDeptCode()); stockOrderService.insertStockOrder(stockOrderEntity); //3.构建单据详情 List temps = filterSupMaps.get(supId); @@ -235,11 +238,11 @@ public class PurPlanController { } } } - } + purApplyEntity.setStockOrderNo(stockOrderNo.substring(1)); + purPlanService.update(purApplyEntity); + } } - - return ResultVOUtils.success("更新成功！"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessChangeTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessChangeTypeDao.java index d3b4dab0..d54b90d9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessChangeTypeDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessChangeTypeDao.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.dao.basic; import com.glxp.api.admin.entity.basic.BussinessChangeTypeEntity; +import com.glxp.api.admin.req.basic.BusTypeChangeFilterRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,6 +13,7 @@ public interface BussinessChangeTypeDao { List findByAction(String action); + List filterAll(BusTypeChangeFilterRequest busTypeChangeFilterRequest); boolean updateBusChangeType(BussinessChangeTypeEntity bussinessTypeEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDao.java index b2b68310..8ed247ac 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDao.java @@ -8,6 +8,7 @@ import com.glxp.api.admin.req.business.StockOrderUploadRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -25,7 +26,7 @@ public interface StockOrderDao { boolean deleteById(@Param("id") String id); - boolean updateByStatus(@Param("orderId") String orderId, @Param("status") Integer status); + boolean updateByStatus(@Param("orderId") String orderId, @Param("status") Integer status, @Param("updateTime") Date updateTime); List filterListOr(StockOrderFilterRequest stockOrderFilterRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessChangeTypeEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessChangeTypeEntity.java index 33f6011f..0e716607 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessChangeTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessChangeTypeEntity.java @@ -20,6 +20,20 @@ public class BussinessChangeTypeEntity { private String defautInvName; private String defautSubInvName; + private String locInv; + private String locSubInv; + private String originAction; + + + private boolean changeEnable; + private boolean supplementAll; + + + + private String originName; + private String targetName; + private String locSubInvName; + public Integer getBeforeTime() { if (beforeTime == null) return 0; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java index bf9e6518..f0a452f5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java @@ -67,6 +67,10 @@ public class UdiRelevanceEntity { //产品描述 private String cpms; + + private Boolean useMuti; //是否多次使用 + private Integer useNum; //最小包装单元可使用次数 + public Integer getLockStatus() { if (lockStatus == null) return 1; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java index 190a842b..73e9899f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java @@ -46,5 +46,5 @@ public class StockOrderDetailEntity { private String measname; private String supId; - + private String supName; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyDetailEntity.java index 0c4b6c96..9add7f6e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyDetailEntity.java @@ -31,5 +31,6 @@ public class PurApplyDetailEntity { * 供应商ID */ private String supId; + private String zczbhhzbapzbh; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java index 6e3b8049..157e8118 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java @@ -76,4 +76,7 @@ public class PurApplyEntity { private String targetSubInv; private String targetBillType; + + private String planBillNo; //生成采购计划单据号 + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanDetailEntity.java index ae25cca5..1aa862b0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanDetailEntity.java @@ -32,4 +32,6 @@ public class PurPlanDetailEntity { */ private String supId; + private String zczbhhzbapzbh; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanEntity.java index 9758d010..e943fe40 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanEntity.java @@ -75,4 +75,15 @@ public class PurPlanEntity { private String auditRemark; + private String stockOrderNo; //生成业务单据号 + private String applyCreateBy; //申购人 + private String applyAuditBy; //申购审核人 + private String applyRemark; //申购说明 + private String applyBillNo; //申购单据号，多单以逗号隔开 + + + private String targetBillAction; + private String targetSubInv; + private String targetInv; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusTypeChangeFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusTypeChangeFilterRequest.java new file mode 100644 index 00000000..b5fda52d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusTypeChangeFilterRequest.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class BusTypeChangeFilterRequest extends ListPageRequest { + + private String action; + private String originAction; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderIdsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderIdsRequest.java index 4ec41f53..62fddfb8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderIdsRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderIdsRequest.java @@ -18,4 +18,5 @@ public class StockOrderIdsRequest { private String zczbhhzbapzbh; private int type; //1：耗材领用 + private int purType; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvWarehouseRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvWarehouseRequest.java index c3547fa0..d4f52c4b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvWarehouseRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvWarehouseRequest.java @@ -29,4 +29,5 @@ public class FilterInvWarehouseRequest extends ListPageRequest { private String warehouseCode; private String superiorCode;//上级 private String subordinateCode;//下级 + private String superiorPcode;//上级 } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java index a52da8c5..c112a398 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java @@ -93,7 +93,7 @@ public class PurApplyRequest extends ListPageRequest { */ private Date createTime; - private String auditRemark; + private String auditRemark; private String targetInv; @@ -103,4 +103,6 @@ public class PurApplyRequest extends ListPageRequest { private String startDate; private String endDate; + private boolean audtoPlan; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java index 0a66d5de..9bda28b1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java @@ -87,6 +87,8 @@ public class UdiRelevanceResponse { private String basicPrductRemak7; private String basicPrductRemak8; private Integer rlId; + private Boolean useMuti; //是否多次使用 + private Integer useNum; //最小包装单元可使用次数 public int getBhzxxsbzsl() { diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java index 7ed9c473..990f25aa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java @@ -68,4 +68,8 @@ public class PurApplyResponse { private String invName; private String subInvName; private String auditRemark; + + private String planBillNo; //生成采购计划单据号 + + private boolean audtoPlan; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurPlanResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurPlanResponse.java index 2d9467b6..e74299ad 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurPlanResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurPlanResponse.java @@ -66,4 +66,11 @@ public class PurPlanResponse { private String invName; private String subInvName; private String auditRemark; + + private String applyCreateBy; //申购人 + private String applyAuditBy; //申购审核人 + private String applyRemark; //申购说明 + private String applyBillNo; //申购单据号，多单以逗号隔开 + + private String stockOrderNo; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessChangeTypeService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessChangeTypeService.java index c1ac2bbf..10b04487 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessChangeTypeService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessChangeTypeService.java @@ -2,6 +2,7 @@ package com.glxp.api.admin.service.basic; import com.glxp.api.admin.entity.basic.BussinessChangeTypeEntity; +import com.glxp.api.admin.req.basic.BusTypeChangeFilterRequest; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -10,6 +11,10 @@ public interface BussinessChangeTypeService { List findByAction(String action); + BussinessChangeTypeEntity findOriginAction(String action); + + List filterAll(BusTypeChangeFilterRequest busTypeChangeFilterRequest); + BussinessChangeTypeEntity findByName(String name); public BussinessChangeTypeEntity findFirstByAction(String action); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessChangeTypeServiceaImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessChangeTypeServiceaImpl.java index 1d95a831..80741d2f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessChangeTypeServiceaImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessChangeTypeServiceaImpl.java @@ -1,7 +1,11 @@ package com.glxp.api.admin.service.basic.impl; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.basic.BussinessChangeTypeDao; import com.glxp.api.admin.entity.basic.BussinessChangeTypeEntity; +import com.glxp.api.admin.req.basic.BusTypeChangeFilterRequest; import com.glxp.api.admin.service.basic.BussinessChangeTypeService; import org.springframework.stereotype.Service; @@ -20,6 +24,30 @@ public class BussinessChangeTypeServiceaImpl implements BussinessChangeTypeServi return data; } + @Override + public BussinessChangeTypeEntity findOriginAction(String action) { + + if (StrUtil.isEmpty(action)) + return null; + BusTypeChangeFilterRequest busTypeChangeFilterRequest = new BusTypeChangeFilterRequest(); + busTypeChangeFilterRequest.setOriginAction(action); + List data = bussinessChangeTypeDao.filterAll(busTypeChangeFilterRequest); + if (CollUtil.isNotEmpty(data)) { + return data.get(0); + } + return null; + } + + @Override + public List filterAll(BusTypeChangeFilterRequest busTypeChangeFilterRequest) { + if (busTypeChangeFilterRequest.getPage() != null) { + int offset = (busTypeChangeFilterRequest.getPage() - 1) * busTypeChangeFilterRequest.getLimit(); + PageHelper.offsetPage(offset, busTypeChangeFilterRequest.getLimit()); + } + List data = bussinessChangeTypeDao.filterAll(busTypeChangeFilterRequest); + return data; + } + @Override public BussinessChangeTypeEntity findFirstByAction(String action) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.java index e613a15a..ef9c34e0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.service.basic.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.basic.UdiInfoDao; import com.glxp.api.admin.entity.basic.UdiInfoEntity; @@ -25,7 +26,7 @@ public class UdiInfoServiceImpl implements UdiInfoService { if (filterUdiInfoRequest == null) { return Collections.emptyList(); } - if(filterUdiInfoRequest.getPage()!=null){ + if (filterUdiInfoRequest.getPage() != null) { int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit(); PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit()); } @@ -102,6 +103,8 @@ public class UdiInfoServiceImpl implements UdiInfoService { @Override public boolean updateUdiInfo(UdiInfoEntity udiInfoEntity) { + if (StrUtil.isEmpty(udiInfoEntity.getUuid())) + return false; return udiInfoDao.updateUdiInfo(udiInfoEntity); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java index 2ebd8161..aa6a09f6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java @@ -107,6 +107,7 @@ public class StockOrderServiceImpl implements StockOrderService { @Override public boolean insertStockOrder(StockOrderEntity stockOrderEntity) { + stockOrderEntity.setUpdateTime(new Date()); return stockOrderDao.insertStockOrder(stockOrderEntity); } @@ -122,6 +123,7 @@ public class StockOrderServiceImpl implements StockOrderService { @Override public boolean updateById(StockOrderEntity stockOrderEntity) { + stockOrderEntity.setUpdateTime(new Date()); return stockOrderDao.updateById(stockOrderEntity); } @@ -137,7 +139,8 @@ public class StockOrderServiceImpl implements StockOrderService { @Override public boolean updateByStatus(String orderId, Integer status) { - return stockOrderDao.updateByStatus(orderId, status); + return stockOrderDao.updateByStatus(orderId, status, new Date()); + } @Override diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java index a2dd7dd0..781aaf06 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java @@ -81,6 +81,8 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService { @Override public InvSubWarehouseEntity findByInvSubByCode(String code) { + if (StrUtil.isEmpty(code)) + return null; FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); filterInvSubWarehouseRequest.setCode(code); List invSubWarehouseEntities = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); @@ -195,6 +197,7 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService { public InvSubWarehouseEntity filterGroupInvSubAndcode(String code) { return invSubWarehouseDao.filterGroupInvSubAndcode(code); } + @Override public List filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest) { return invSubWarehouseDao.filterGroupInvSubDown(filterInvSubWarehouseRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java index aad2ab2c..b1d5d4b2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java @@ -10,6 +10,7 @@ import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.inout.*; import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; import com.glxp.api.admin.entity.inventory.InvProductEntity; +import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; @@ -21,6 +22,7 @@ import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.*; import com.glxp.api.admin.service.inventory.*; import com.glxp.api.admin.util.*; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -28,6 +30,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.*; +@Slf4j @Service public class InvProductsTrService { @@ -72,9 +75,17 @@ public class InvProductsTrService { InvWarehouseService invWarehouseService; @Resource GennerOrderUtils gennerOrderUtils; + @Resource + InvSubWarehouseService invSubWarehouseService; @Async public void genInvProducts(String orderId) { + //导入订单状态 + IOOrderStatusEntity ioOrderStatusEntity = new IOOrderStatusEntity(); + ioOrderStatusEntity.setStatus(1); + ioOrderStatusEntity.setUpdateTime(new Date()); + ioOrderStatusEntity.setOrderId(orderId); + ioOrderStatusService.insertOrderStatus(ioOrderStatusEntity); OrderEntity orderEntity = orderService.findById(orderId); if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS && @@ -95,31 +106,11 @@ public class InvProductsTrService { if (bussinessTypeEntity.isPreIn()) { InvProductEntity invPreProductEntity = null; -// invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), warehouseEntity.getSupId() -// , warehouseEntity.getLocStorageCode(), warehouseEntity.getInvWarehouseCode()); if (invPreProductEntity == null) { invPreProductEntity = buildInvPreInProduct(orderEntity, erpOrderEntity, warehouseEntity); invPreProductEntity.setUpdateTime(new Date()); invPreInProductService.insertInvProduct(invPreProductEntity); } - - /** - * else { - * int actCount = getActCount(warehouseEntity); - * int count = actCount * warehouseEntity.getCount(); - * if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - * invPreProductEntity.setOutCount(invPreProductEntity.getOutCount() + count); - * } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { - * invPreProductEntity.setInCount(invPreProductEntity.getInCount() + count); - * } - * if (erpOrderEntity.getPrice() != null) { - * invPreProductEntity.setPrice(erpOrderEntity.getPrice() + ""); - * } - * invPreProductEntity.setUpdateTime(new Date()); - * invPreInProductService.updateInvProduct(invPreProductEntity); - * } - */ - } else if (bussinessTypeEntity.isAdvanceType()) {//预入库，则转存预入库 InvProductEntity invPreProductEntity = invPreProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), warehouseEntity.getSupId() @@ -166,10 +157,13 @@ public class InvProductsTrService { } if (orderEntity.isPreCheck()) { + + //暂时不需要去计算库存 // int actCount = getActCount(warehouseEntity); // int count = actCount * warehouseEntity.getCount(); // InvProductEntity preInvEntity = invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), // warehouseEntity.getSupId(), null, null); +// // if (preInvEntity != null) { // if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { // preInvEntity.setOutCount(preInvEntity.getOutCount() + count); @@ -177,9 +171,10 @@ public class InvProductsTrService { // if (erpOrderEntity.getPrice() != null) { // preInvEntity.setPrice(erpOrderEntity.getPrice() + ""); // } +// preInvEntity.setUpdateTime(new Date()); +// invPreInProductService.updateInvProduct(preInvEntity); // } -// preInvEntity.setUpdateTime(new Date()); -// invPreInProductService.updateInvProduct(preInvEntity); + } } @@ -205,12 +200,6 @@ public class InvProductsTrService { invProductDetailEntities = buildInvProductDetail(orderId, erpOrderEntity, orderEntity, 3); } else { invProductDetailEntities = buildInvProductDetail(orderId, erpOrderEntity, orderEntity, 2); - -// if (orderEntity.isPreCheck()) { -//// insetInv(bussinessTypeEntity, invProductDetailEntities);//2.插入当前库存 -// -// invPreInProductDetailService.insertInvProducts(invProductDetailEntities); -// } } if (invProductDetailEntities != null && invProductDetailEntities.size() > 0) { mInvProductDetailEntities.addAll(invProductDetailEntities); @@ -220,32 +209,35 @@ public class InvProductsTrService { } //单据流转 - List bussinessChangeTypeEntitys = bussinessChangeTypeService.findByAction(bussinessLocalTypeEntity.getLocalAction()); - if ((bussinessChangeTypeEntitys != null && bussinessChangeTypeEntitys.size() > 0) && bussinessLocalTypeEntity.isChangeEnable()) { - - if (orderEntity.isOutChangeEnable()) {//是否缺量补单 - //普通出库 - if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) { - addUseOutOrder(orderEntity, mInvProductDetailEntities, bussinessChangeTypeEntitys); - } else if (ConstantType.TYPE_PUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) - //普通入库补单 - { - BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeEntitys.get(0); - List datas = addPutOrder(orderEntity, mInvProductDetailEntities); - List temps = filterMapCodes(datas); - buildPreOutOrder(bussinessChangeTypeEntity, temps, orderEntity); //3.生成流转单据 - } else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && bussinessTypeEntity.isAdvanceType()) { - //寄售出库补单 - BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeEntitys.get(0); - List datas = addPreOutOrder(orderEntity, mInvProductDetailEntities); - List temps = filterMapCodes(datas); - buildPreInOrder(bussinessChangeTypeEntity, temps, orderEntity); //3.生成流转单据 - } else { - insetInv(bussinessTypeEntity, mInvProductDetailEntities);//2.插入当前库存 - } - } else { - insetInv(bussinessTypeEntity, mInvProductDetailEntities);//2.插入当前库存 - } + BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeService.findOriginAction(bussinessLocalTypeEntity.getLocalAction()); + if (bussinessChangeTypeEntity != null && bussinessLocalTypeEntity.isChangeEnable()) { + + addUseOutOrder(orderEntity, mInvProductDetailEntities, bussinessChangeTypeEntity); + + +// if (orderEntity.isOutChangeEnable()) {//是否缺量补单 +// //普通出库 +// if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) { +// addUseOutOrder(orderEntity, mInvProductDetailEntities, bussinessChangeTypeEntitys); +// } else if (ConstantType.TYPE_PUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) +// //普通入库补单 +// { +// BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeEntitys.get(0); +// List datas = addPutOrder(orderEntity, mInvProductDetailEntities); +// List temps = filterMapCodes(datas); +// buildPreOutOrder(bussinessChangeTypeEntity, temps, orderEntity); //3.生成流转单据 +// } else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && bussinessTypeEntity.isAdvanceType()) { +// //寄售出库补单 +// BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeEntitys.get(0); +// List datas = addPreOutOrder(orderEntity, mInvProductDetailEntities); +// List temps = filterMapCodes(datas); +// buildPreInOrder(bussinessChangeTypeEntity, temps, orderEntity); //3.生成流转单据 +// } else { +// insetInv(bussinessTypeEntity, mInvProductDetailEntities);//2.插入当前库存 +// } +// } else { +// insetInv(bussinessTypeEntity, mInvProductDetailEntities);//2.插入当前库存 +// } } else { insetInv(bussinessTypeEntity, mInvProductDetailEntities);//2.插入当前库存 @@ -255,28 +247,13 @@ public class InvProductsTrService { } //普通出库补单-- //补采购入库，调拨入库，寄售转入 - public void addUseOutOrder(OrderEntity orderEntity, List invProductDetailEntities, List bussinessChangeTypeEntities) { - - BussinessChangeTypeEntity advChangeTypeEntity = null; - BussinessChangeTypeEntity norChangeTypeEntity = null; - BussinessChangeTypeEntity outChangeTypeEntity = null; - BussinessChangeTypeEntity innorChangeTypeEntity = null; - for (BussinessChangeTypeEntity bussinessChangeTypeEntity : bussinessChangeTypeEntities) { - if (bussinessChangeTypeEntity.getChangeType() == ConstantStatus.ORDER_CHANGE_NORMAL_ADV_IN) { - advChangeTypeEntity = bussinessChangeTypeEntity; - } else if (bussinessChangeTypeEntity.getChangeType() == ConstantStatus.ORDER_CHANGE_NORMAL_IN) { - outChangeTypeEntity = bussinessChangeTypeEntity; - } else if (bussinessChangeTypeEntity.getChangeType() == ConstantStatus.ORDER_CHANGE_INNOR_NORMAL_IN) { - innorChangeTypeEntity = bussinessChangeTypeEntity; - } - } + public void addUseOutOrder(OrderEntity orderEntity, List invProductDetailEntities, BussinessChangeTypeEntity bussinessChangeTypeEntity) { List warehouseEntities = codesService.findByReceiptId(orderEntity.getId()); List inList = new ArrayList<>(); List preiInList = new ArrayList<>(); //缺量补单时是否全量补单 BussinessTypeEntity bussinessTypeEntity1 = bussinessTypeService.findBTByAction(orderEntity.getAction()); -// SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("ullage_supplement_all"); - if (bussinessTypeEntity1.isSupplementAll()) { + if (bussinessChangeTypeEntity.isSupplementAll()) { insetInv(bussinessTypeEntity1, invProductDetailEntities);//2.插入当前库存 WarehouseEntity warehouseEntity = warehouseEntities.get(0); InvWarehouseEntity locWarehouseEntity = invWarehouseService.selectByCode(warehouseEntity.getLocStorageCode()); @@ -286,15 +263,12 @@ public class InvProductsTrService { } } else { if (locWarehouseEntity.getLevel() > 1) { - norChangeTypeEntity = innorChangeTypeEntity; - InvWarehouseEntity pInWarehouseEntity = invWarehouseService.selectByCode(locWarehouseEntity.getPcode()); for (WarehouseEntity tempEntity : warehouseEntities) { - tempEntity.setFromCorp(pInWarehouseEntity.getName()); - tempEntity.setFromCorpId(pInWarehouseEntity.getCode()); + tempEntity.setFromCorp(bussinessChangeTypeEntity.getDefaultInv()); + tempEntity.setFromCorpId(bussinessChangeTypeEntity.getDefaultSubInv()); inList.add(tempEntity); } } else { - norChangeTypeEntity = outChangeTypeEntity; BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(warehouseEntity.getSupId()); for (WarehouseEntity tempEntity : warehouseEntities) { tempEntity.setFromCorpId(warehouseEntity.getSupId()); @@ -314,7 +288,7 @@ public class InvProductsTrService { * else（仓库等级>1） * {可能需要补录的入库单据有一种：《调拨入库》} */ - InvWarehouseEntity locWarehouseEntity = invWarehouseService.selectByCode(warehouseEntity.getLocStorageCode()); + InvWarehouseEntity locWarehouseEntity = invWarehouseService.selectByCode(bussinessChangeTypeEntity.getLocInv()); if (locWarehouseEntity.getLevel() == 1 && isAdavnce(warehouseEntity)) {//补寄售转入 //获取当前条码实际数量 int actCount = getActCount(warehouseEntity); @@ -325,7 +299,7 @@ public class InvProductsTrService { * 《寄售转入库》往来单位： * 单据类型的当前仓库（如果当前仓库有设置，则判断该当前仓库是否为1级库并且仓库类型=寄售，如果没设置，那么往来单位自动为默认寄售仓库），当前仓库：出库单据的当前仓库 */ - BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(advChangeTypeEntity.getScAction()); + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessChangeTypeEntity.getScAction()); InvWarehouseEntity invWarehouseEntity; if (!StrUtil.isEmpty(bussinessTypeEntity.getStorageCode())) { invWarehouseEntity = invWarehouseService.selectByCode(bussinessTypeEntity.getStorageCode()); @@ -337,13 +311,11 @@ public class InvProductsTrService { } else invWarehouseEntity = invWarehouseService.findDefault(true, true); - int invCount = getCountByOrder(null, warehouseEntity); warehouseEntity.setFromCorpId(invWarehouseEntity.getCode()); warehouseEntity.setFromCorp(invWarehouseEntity.getName()); if (invCount > 0) {//仓库已存在该产品 if (count > invCount) { //当前数量>结余数量，说明该产品是无序列号或者是多级包装 -// UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode()); if (actCount > invCount) { //该产品实际数量大于结余数量，说明是多级包装，直接补 preiInList.add(warehouseEntity); } else if (warehouseEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量 @@ -364,26 +336,27 @@ public class InvProductsTrService { String code = warehouseEntity.getCode(); int count = actCount * warehouseEntity.getCount(); int invCount = 0; - if (locWarehouseEntity.getLevel() > 1) {//补调拨入库 - /** - * 调拨入库》往来单位：出库单据的当前仓库的父级仓库，当前仓库：出库单据的当前仓库； - */ - InvWarehouseEntity pInWarehouseEntity = invWarehouseService.selectByCode(locWarehouseEntity.getPcode()); - warehouseEntity.setFromCorp(pInWarehouseEntity.getName()); - warehouseEntity.setFromCorpId(pInWarehouseEntity.getCode()); - - invCount = getCountByOrder(null, warehouseEntity); - norChangeTypeEntity = innorChangeTypeEntity; - } else { //补供应商入库 + if (locWarehouseEntity.getLevel() == 1 && StrUtil.isEmpty(bussinessChangeTypeEntity.getDefaultSubInv())) { /** * 供应商入库》往来单位：根据产品指定的供应商，当前仓库：出库单据的当前仓库； */ - //供应商 warehouseEntity.setFromCorpId(warehouseEntity.getSupId()); BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(warehouseEntity.getSupId()); warehouseEntity.setFromCorp(basicUnitMaintainEntity.getName()); invCount = getCountByOrder(null, warehouseEntity); - norChangeTypeEntity = outChangeTypeEntity; + } else if (StrUtil.isNotEmpty(bussinessChangeTypeEntity.getDefaultSubInv())) { + /** + * 调拨入库》往来单位：出库单据的当前仓库的父级仓库，当前仓库：出库单据的当前仓库； + */ + InvSubWarehouseEntity subWarehouseEntity = invSubWarehouseService.findByInvSubByCode(bussinessChangeTypeEntity.getDefaultSubInv()); + warehouseEntity.setFromCorp(subWarehouseEntity.getName()); + warehouseEntity.setFromCorpId(subWarehouseEntity.getParentId()); + warehouseEntity.setFromSubInvCode(subWarehouseEntity.getCode()); + invCount = getCountByOrder(null, warehouseEntity); + } else { + //无法补单，补单失败！ + log.error("无法补单，补单失败！,单据流转设置未设置补单往来信息（" + orderEntity.getId() + ")"); + return; } if (invCount > 0) {//仓库已存在该产品 @@ -411,12 +384,12 @@ public class InvProductsTrService { if (inList.size() > 0) { List temps = filterMapCodes(inList); - buildInOrder(norChangeTypeEntity, temps, orderEntity); //3.生成采购入库流转单据 + buildInOrder(bussinessChangeTypeEntity, temps, orderEntity); //3.生成采购入库流转单据 } if (preiInList.size() > 0) { List temps1 = filterMapCodes(preiInList); - buildNorPreInOrder(advChangeTypeEntity, temps1, orderEntity); //3.补寄售转入 + buildNorPreInOrder(bussinessChangeTypeEntity, temps1, orderEntity); //3.补寄售转入 } } @@ -646,7 +619,6 @@ public class InvProductsTrService { outOrder.setFromCorpId(null); outOrder.setLocStorageCode(orderEntity.getLocStorageCode()); outOrder.setInvStorageCode(orderEntity.getInvStorageCode()); - //互填单号 orderEntity.setUllageSupNo(outOrder.getId()); orderEntity.setUpdateTime(new Date()); @@ -692,7 +664,9 @@ public class InvProductsTrService { } else unkonwCorpList.add(warehouseEntity); } - BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessChangeTypeEntity.getScAction()); + + BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessChangeTypeEntity.getAction()); + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessLocalTypeEntity.getAction()); //根据往来单位生成入库单 for (String corpName : filterSupMaps.keySet()) { List temps; @@ -702,8 +676,8 @@ public class InvProductsTrService { outOrder.setSupplementNo(null);//补单需置空 outOrder.setActDate(DateUtil.getBeforeDay(outOrder.getActDate(), bussinessChangeTypeEntity.getBeforeTime())); outOrder.setCreateTime(outOrder.getActDate()); - outOrder.setAction(bussinessChangeTypeEntity.getScAction()); - outOrder.setMainAction(ConstantType.TYPE_PUT); + outOrder.setAction(bussinessTypeEntity.getAction()); + outOrder.setMainAction(bussinessTypeEntity.getMainAction()); outOrder.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID); outOrder.setErpFk(null); @@ -712,16 +686,13 @@ public class InvProductsTrService { outOrder.setId(orderNo); outOrder.setFromCorpId(corpName); outOrder.setFromCorp(temps.get(0).getFromCorp()); - -// BussinessTypeEntity originBT = bussinessTypeService.findBTByAction(orderEntity.getAction()); if (StrUtil.isNotEmpty(bussinessChangeTypeEntity.getDefaultSubInv())) { outOrder.setFromSubInvCode(bussinessChangeTypeEntity.getDefaultSubInv()); } - outOrder.setCorpOrderId(CustomUtil.getId() + "x"); - outOrder.setLocStorageCode(orderEntity.getLocStorageCode()); - outOrder.setInvStorageCode(orderEntity.getInvStorageCode()); - + outOrder.setLocStorageCode(bussinessChangeTypeEntity.getLocInv()); + outOrder.setInvStorageCode(bussinessChangeTypeEntity.getLocInv()); + outOrder.setInvWarehouseCode(bussinessChangeTypeEntity.getLocSubInv()); SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit"); if ("1".equals(systemParamConfigEntity.getParamValue())) { outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); @@ -746,8 +717,8 @@ public class InvProductsTrService { warehouseEntity.setFromCorpId(outOrder.getFromCorpId()); warehouseEntity.setLocStorageCode(outOrder.getLocStorageCode()); warehouseEntity.setInvWarehouseCode(outOrder.getInvWarehouseCode()); - warehouseEntity.setAction(bussinessChangeTypeEntity.getScAction()); - warehouseEntity.setMainAction(ConstantType.TYPE_PUT); + warehouseEntity.setAction(outOrder.getAction()); + warehouseEntity.setMainAction(outOrder.getMainAction()); } codesTempService.insertCodesTemp(temps); } @@ -963,6 +934,7 @@ public class InvProductsTrService { } } + public void insetInvSingle(boolean isPre, InvProductDetailEntity invProductDetailEntity) { List invProductDetailEntities = new ArrayList<>(); invProductDetailEntities.add(invProductDetailEntity); diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml index d4f9b813..99f42f0d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml @@ -5,7 +5,10 @@ + + + insert INTO basic_bustype_pre - (action, scAction, `index`, remark, beforeTime, intro, changeType, defaultInv, defaultSubInv) + ( `action`, scAction, `index`, remark, beforeTime, intro, changeType, defaultInv, defaultSubInv + , locInv, locSubInv, originAction, changeEnable, supplementAll) values (#{action}, #{scAction}, #{index}, #{remark}, - #{beforeTime}, #{intro}, #{changeType},#{defaultInv},#{defaultSubInv}) + #{beforeTime}, #{intro}, #{changeType}, #{defaultInv}, #{defaultSubInv} + , #{locInv}, #{locSubInv}, #{originAction}, #{changeEnable}, #{supplementAll}) + @@ -40,6 +68,11 @@ changeType = #{changeType}, defaultInv = #{defaultInv}, defaultSubInv = #{defaultSubInv}, + locInv = #{locInv}, + locSubInv = #{locSubInv}, + originAction = #{originAction}, + changeEnable = #{changeEnable}, + supplementAll = #{supplementAll}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml index e732f474..4a933752 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -279,7 +279,7 @@ basicPrductRemak8=#{basicPrductRemak8}, - WHERE nameCode = #{nameCode} + WHERE uuid = #{uuid} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 7da3fb3d..2038884b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -30,10 +30,10 @@ basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid ,basic_products.basicPrductRemak1 ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6 - ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8 + ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8, basic_udirel.useNum, basic_udirel.useMuti FROM basic_udirel - inner JOIN basic_products - ON basic_products.uuid = basic_udirel.uuid + inner JOIN basic_products + ON basic_products.uuid = basic_udirel.uuid AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') @@ -97,83 +97,83 @@ select basic_udirel.id, - basic_udirel.thirdId, - basic_udirel.thirdName, - basic_udirel.isUseDy, - basic_udirel.thirdId1, - basic_udirel.thirdId2, - basic_udirel.thirdId3, - basic_udirel.thirdId4, - basic_udirel.ybbm, - basic_udirel.sptm, - basic_udirel.isDisable, - basic_udirel.isLock, - basic_udirel.lockStatus, - basic_udirel.thirdName1, - basic_udirel.thirdName2, - basic_udirel.thirdName3, - basic_udirel.thirdName4, - basic_udirel.manufactory, - basic_udirel.measname, - basic_udirel.udplatCode, - basic_products.allowNoBatch, - basic_products.allowNoExpire, - basic_products.allowNoProduct, - basic_udirel.price, - basic_products.nameCode, - basic_products.packRatio, - basic_products.packLevel, - basic_products.bhxjsl, - basic_products.bhzxxsbzsl, - basic_products.zxxsbzbhsydysl, - basic_products.bhxjcpbm, - basic_products.bzcj, - basic_products.addType, - basic_products.deviceRecordKey, - basic_products.cpmctymc, - basic_products.cplb, - basic_products.flbm, - basic_products.ggxh, - basic_products.qxlb, - basic_products.tyshxydm, - basic_products.ylqxzcrbarmc, - basic_products.zczbhhzbapzbh, - basic_products.ylqxzcrbarywmc, - basic_products.sydycpbs, - basic_products.uuid, - basic_products.sjcpbm, - basic_products.versionNumber, - basic_products.diType, - basic_udirel.mainId, - basic_udirel.mainName, - basic_udirel.isAdavence, - basic_products.scbssfbhph, - basic_products.scbssfbhxlh, - basic_products.scbssfbhscrq, - basic_products.cpdls, - basic_products.scbssfbhsxrq, - basic_products.cpms, - basic_udirel.supName, - basic_products.originUuid, - basic_products.spmc, - basic_products.basicPrductRemak1 - , - basic_products.basicPrductRemak2, - basic_products.basicPrductRemak3, - basic_products.basicPrductRemak4, - basic_products.basicPrductRemak5, - basic_products.basicPrductRemak6 - , - basic_products.basicPrductRemak7, - basic_products.basicPrductRemak8 + basic_udirel.thirdId, + basic_udirel.thirdName, + basic_udirel.isUseDy, + basic_udirel.thirdId1, + basic_udirel.thirdId2, + basic_udirel.thirdId3, + basic_udirel.thirdId4, + basic_udirel.ybbm, + basic_udirel.sptm, + basic_udirel.isDisable, + basic_udirel.isLock, + basic_udirel.lockStatus, + basic_udirel.thirdName1, + basic_udirel.thirdName2, + basic_udirel.thirdName3, + basic_udirel.thirdName4, + basic_udirel.manufactory, + basic_udirel.measname, + basic_udirel.udplatCode, + basic_products.allowNoBatch, + basic_products.allowNoExpire, + basic_products.allowNoProduct, + basic_udirel.price, + basic_products.nameCode, + basic_products.packRatio, + basic_products.packLevel, + basic_products.bhxjsl, + basic_products.bhzxxsbzsl, + basic_products.zxxsbzbhsydysl, + basic_products.bhxjcpbm, + basic_products.bzcj, + basic_products.addType, + basic_products.deviceRecordKey, + basic_products.cpmctymc, + basic_products.cplb, + basic_products.flbm, + basic_products.ggxh, + basic_products.qxlb, + basic_products.tyshxydm, + basic_products.ylqxzcrbarmc, + basic_products.zczbhhzbapzbh, + basic_products.ylqxzcrbarywmc, + basic_products.sydycpbs, + basic_products.uuid, + basic_products.sjcpbm, + basic_products.versionNumber, + basic_products.diType, + basic_udirel.mainId, + basic_udirel.mainName, + basic_udirel.isAdavence, + basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.cpdls, + basic_products.scbssfbhsxrq, + basic_products.cpms, + basic_udirel.supName, + basic_products.originUuid, + basic_products.spmc, + basic_products.basicPrductRemak1 + , + basic_products.basicPrductRemak2, + basic_products.basicPrductRemak3, + basic_products.basicPrductRemak4, + basic_products.basicPrductRemak5, + basic_products.basicPrductRemak6 + , + basic_products.basicPrductRemak7, + basic_products.basicPrductRemak8,basic_udirel.useNum, basic_udirel.useMuti FROM basic_products - right JOIN basic_udirel - ON basic_products.uuid = basic_udirel.uuid + right JOIN basic_udirel + ON basic_products.uuid = basic_udirel.uuid AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') @@ -334,16 +334,16 @@ and ( - nameCode LIKE concat('%', #{unionCode}, '%') - or basic_udirel.ybbm LIKE concat('%', #{unionCode}, '%') - or basic_udirel.sptm LIKE concat('%', #{unionCode}, '%')) + nameCode LIKE concat('%', #{unionCode}, '%') + or basic_udirel.ybbm LIKE concat('%', #{unionCode}, '%') + or basic_udirel.sptm LIKE concat('%', #{unionCode}, '%')) and (thirdId LIKE concat('%', #{thrPiId}, '%') - or thirdId1 LIKE concat('%', #{thrPiId}, '%') - or thirdId2 LIKE concat('%', #{thrPiId}, '%') - or thirdId3 LIKE concat('%', #{thrPiId}, '%') - or thirdId4 LIKE concat('%', #{thrPiId}, '%')) + or thirdId1 LIKE concat('%', #{thrPiId}, '%') + or thirdId2 LIKE concat('%', #{thrPiId}, '%') + or thirdId3 LIKE concat('%', #{thrPiId}, '%') + or thirdId4 LIKE concat('%', #{thrPiId}, '%')) AND basic_udirel.uuid = #{uuid} @@ -362,7 +362,7 @@ AND (thirdId ]]> '' or thirdId1 ]]> '' or thirdId2 ]]> '' or - thirdId3 ]]> '' or thirdId4 ]]> '') + thirdId3 ]]> '' or thirdId4 ]]> '') and basic_products.originUuid ]]> '' @@ -423,7 +423,7 @@ resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity"> select * from basic_udirel - INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid + INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid AND basic_udirel.uuid = #{uuid} @@ -545,11 +545,11 @@ replace - INTO basic_udirel + INTO basic_udirel (id, thirdId,thirdName,uuid,isUseDy,updateTime,modifyTime, thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock - ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price + ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price ,useNum,useMuti ) values ( @@ -579,19 +579,22 @@ #{lockStatus}, #{udplatCode}, #{isAdavence}, - #{supName},#{price} + #{supName}, + #{price}, + #{useNum}, + #{useMuti} ) insert - ignore + ignore INTO basic_udirel (id, thirdId,thirdName,uuid,isUseDy,updateTime,modifyTime, thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock - ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime + ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime,useNum,useMuti ) values ( @@ -622,7 +625,10 @@ #{udplatCode}, #{isAdavence}, #{supName}, - #{price},#{modifyTime} + #{price}, + #{modifyTime}, + #{useNum}, + #{useMuti} ) @@ -728,6 +734,8 @@ price=#{price}, + useNum=#{useNum}, + useMuti=#{useMuti} WHERE id = #{id} @@ -748,34 +756,35 @@ - replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, modifyTime, thirdId1, thirdId2, thirdId3, + replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, modifyTime, thirdId1, thirdId2, + thirdId3, thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory, - measname, isDisable, mainId, mainName, udplatCode,supName,price,modifyTime) + measname, isDisable, mainId, mainName, udplatCode,supName,price,modifyTime,useNum,useMuti) values (#{item.id}, - #{item.thirdId}, - #{item.thirdName}, - #{item.uuid}, - #{item.isUseDy}, - #{item.updateTime}, - #{item.modifyTime}, - #{item.thirdId1}, - #{item.thirdId2}, - #{item.thirdId3}, - #{item.thirdId4}, - #{item.thirdName1}, - #{item.thirdName2}, - #{item.thirdName3}, - #{item.thirdName4}, - #{item.ybbm}, - #{item.sptm}, - #{item.manufactory}, - #{item.measname}, - #{item.isDisable}, - #{item.mainId}, - #{item.mainName}, - #{item.udplatCode}, #{item.supName}, #{item.price}, #{modifyTime}) + #{item.thirdId}, + #{item.thirdName}, + #{item.uuid}, + #{item.isUseDy}, + #{item.updateTime}, + #{item.modifyTime}, + #{item.thirdId1}, + #{item.thirdId2}, + #{item.thirdId3}, + #{item.thirdId4}, + #{item.thirdName1}, + #{item.thirdName2}, + #{item.thirdName3}, + #{item.thirdName4}, + #{item.ybbm}, + #{item.sptm}, + #{item.manufactory}, + #{item.measname}, + #{item.isDisable}, + #{item.mainId}, + #{item.mainName}, + #{item.udplatCode}, #{item.supName}, #{item.price}, #{modifyTime},#{item.useNum},#{item.useMuti}) \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml index 4ca57a20..05126fc8 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml @@ -95,7 +95,7 @@ UPDATE stock_order - SET `status` = #{status} + SET `status` = #{status},`updateTime` = #{updateTime} where id = #{orderId} @@ -218,7 +218,7 @@ group by stock_order.id - ORDER BY id DESC + ORDER BY updateTime DESC diff --git a/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml index a3e24b3d..1636800a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml @@ -6,7 +6,7 @@ diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml index 6cf63713..b184fb97 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml @@ -54,7 +54,8 @@ - select a.id, a.code, a.name, a.parentId, a.remark, a.defaultInv, a.thirdId, a.thirdId1, a.thirdId2, + select a.id, a.code, a.name, a.parentId, a.remark, a.defaultInv, a.thirdId, a.thirdId1, a.thirdId2, a.thirdId3, a.thirdId4, b.name as parentName FROM inv_warehouse_sub a left join inv_warehouse b on a.parentId = b.code @@ -217,7 +218,8 @@