diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index d8cad22c..84c9b9e1 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -162,58 +162,6 @@ public class InvWarehouseController extends BaseController { } - @AuthRuleAnnotation("") - @GetMapping("spms/sub/inv/warehouse/findByInv") - public BaseResponse findByInv(FilterInvWarehouseRequest filterInvWarehouseRequest) { - -// if (StrUtil.isEmpty(filterInvWarehouseRequest.getPcode()) || filterInvWarehouseRequest.getUserId() == null) { -// return ResultVOUtils.error(500, "用户或仓库不能未空！"); -// } - - AuthAdmin authAdmin = customerService.getUserBean(); - if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) { - if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1 || filterInvWarehouseRequest.getFilter() == 2) { - if (authAdmin.getCustomerId() == "110") { - filterInvWarehouseRequest.setUserId(authAdmin.getId()); - } else { - filterInvWarehouseRequest.setSpUse(true); - } - } - } else { - if (filterInvWarehouseRequest.getFilter() != null && filterInvWarehouseRequest.getFilter() == 3) { - filterInvWarehouseRequest.setUserId(authAdmin.getId()); - } else { - //走这边表示单据选择的是往来单位里面调出调入的库 - //判断单据类型是1就是设置单据需要需要查询除自己以外的分库 - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); - if (systemParamConfigEntity.getParamValue().equals("0")) { - //不允许调拨 - // 查询总库信息 - InvWarehouseEntity invWarehouseEntity = invWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); - //查询仓库信息 - if (invWarehouseEntity != null) { - DeptEntity deptEntity = deptService.selectByCodeAll(invWarehouseEntity.getParentId()); - filterInvWarehouseRequest.setSuperiorCode(deptEntity.getCode()); - filterInvWarehouseRequest.setSuperiorPcode(deptEntity.getPcode()); - filterInvWarehouseRequest.setCode(null); - } else { - return ResultVOUtils.error(999, "分库编号为空！"); - } - - - } else { - //允许调拨 - //查询总库信息 - InvWarehouseEntity invWarehouseEntity = invWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); - filterInvWarehouseRequest.setWarehouseCode(invWarehouseEntity.getParentId()); - filterInvWarehouseRequest.setCode(null); - } - } - } - - List invSubWarehouseEntities = invWarehouseService.filterGroupInvSub(filterInvWarehouseRequest); - return ResultVOUtils.success(invSubWarehouseEntities); - } @AuthRuleAnnotation("") @GetMapping("spms/sub/inv/warehouse/filterSub") diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index fb9548d5..8747a844 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -134,7 +134,7 @@ public class BasicOrderPrintController { bizData.put("productDate", obj.getProductDate()); bizData.put("expireDate", obj.getExpireDate()); bizData.put("manufactor", obj.getManufacturer()); - bizData.put("zczbhhzbapzbh", udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh()); + bizData.put("zczbhhzbapzbh", obj.getCertCode() == null ? ' ' : obj.getCertCode()); bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); list.add(bizData); i++; @@ -183,7 +183,7 @@ public class BasicOrderPrintController { bizData.put("productDate", ioOrderDetailBizEntity.getProductDate()); bizData.put("expireDate", ioOrderDetailBizEntity.getExpireDate()); bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer()); - bizData.put("zczbhhzbapzbh", udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh()); + bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode()); bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); list.add(bizData); i++; diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 6293112a..60de2142 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -591,7 +591,7 @@ public class IoCodeTempController extends BaseController { if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) { //只采集非集采产品 return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品！"); } - + //计算实际数量 codeEnttity.setReCount(codeEnttity.getMyCount() * udiCalCountUtil.getActCount(udiRelevanceResponse)); } else if (udiRelevanceResponses.size() == 0) { @@ -642,16 +642,6 @@ public class IoCodeTempController extends BaseController { if (invRes != null) { return invRes; } - //是否边扫边校验 - if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.isCheckWebNew()) { - String errMsg = ioCheckInoutService.checkCode(codeEnttity); - if (errMsg != null) { - return ResultVOUtils.error(500, errMsg); - } else - codeTempService.insert(codeEnttity); - } else { - codeTempService.insert(codeEnttity); - } genDetaiEntity = codeEnttity; if (baseResponse == null) { baseResponse = checkSupId(bussinessTypeEntity, codeEnttity, unitFk); @@ -666,6 +656,17 @@ public class IoCodeTempController extends BaseController { checkSupId(bussinessTypeEntity, codeEnttity, unitFk); return baseResponse; } + + //是否边扫边校验 + if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.isCheckWebNew()) { + String errMsg = ioCheckInoutService.checkCode(codeEnttity); + if (errMsg != null) { + return ResultVOUtils.error(500, errMsg); + } else + codeTempService.insert(codeEnttity); + } else { + codeTempService.insert(codeEnttity); + } } addCodeResult.setOrderId(orderId); transInoutService.genOrderDetailCode(orderEntity, genDetaiEntity); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java b/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java index cb1a4b00..3d9a0e11 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java @@ -13,11 +13,10 @@ import com.glxp.api.constant.ConstantType; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; -import com.glxp.api.entity.purchase.PurApplyEntity; -import com.glxp.api.entity.purchase.PurArrivalDetailEntity; -import com.glxp.api.entity.purchase.PurArrivalEntity; +import com.glxp.api.entity.purchase.*; import com.glxp.api.req.purchase.PostPurArrivalRequest; import com.glxp.api.req.purchase.PurArrivalRequest; +import com.glxp.api.req.purchase.PurDeliveryRequest; import com.glxp.api.req.purchase.PurOrderDetailRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.purchase.PurArrivalDetailResponse; @@ -27,10 +26,12 @@ import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.purchase.PurArrivalDetailService; import com.glxp.api.service.purchase.PurArrivalService; +import com.glxp.api.service.purchase.PurDeliveryDetailService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -301,4 +302,37 @@ public class PurArrivalController { return ResultVOUtils.success("删除成功"); } + + @Resource + PurDeliveryDetailService purDeliveryDetailService; + + /** + * 添加采购订单至送货单 + */ + @PostMapping("/purchase/arrival/addPlanDetailAndOrder") + public BaseResponse addPlanDetailAndOrder(@RequestBody PurArrivalRequest purArrivalRequest) { + + + List purDeliveryDetailEntities = purDeliveryDetailService.findByOrderId(purArrivalRequest.getPurDeliveryId() + ""); + List purArrivalDetailEntities = purDeliveryDetailEntities.stream() + .map(e -> { + PurArrivalDetailEntity d = new PurArrivalDetailEntity(); + BeanUtils.copyProperties(e, d); + return d; + }) + .collect(Collectors.toList()); + for (PurDeliveryDetailEntity obj : purDeliveryDetailEntities) { + obj.setOrderIdFk(purArrivalRequest.getId() + ""); + } + boolean falg = purArrivalDetailService.insertPurArrivalDetailEntity(purArrivalDetailEntities); + if (falg) { + //查询申购单 + return ResultVOUtils.success("添加成功"); + + } else { + return ResultVOUtils.success("添加失败"); + } + } + + } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java b/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java index 297d4df0..41da0223 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java @@ -10,6 +10,7 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; +import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; @@ -41,7 +42,7 @@ import java.util.stream.Collectors; @Validated @RequiredArgsConstructor @RestController -public class PurDeliveryController { +public class PurDeliveryController extends BaseController { @Resource @@ -251,6 +252,7 @@ public class PurDeliveryController { purArrivalEntity.setCreateTime(new Date()); purArrivalEntity.setUpdateTime(new Date()); purArrivalEntity.setUpdateUser(userId + ""); + purArrivalEntity.setSupId(getCustomerId()); purDeliveryService.insert(purArrivalEntity); Long id = purArrivalEntity.getId(); return ResultVOUtils.success(id); diff --git a/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDao.java b/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDao.java index 3cc894d6..72ebce76 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDao.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.purchase.PurDeliveryEntity; import com.glxp.api.req.purchase.PurDeliveryRequest; import com.glxp.api.res.purchase.PurDeliveryResponse; +import org.apache.ibatis.annotations.Mapper; import java.util.List; +@Mapper public interface PurDeliveryDao extends BaseMapper { List queryPageList(PurDeliveryRequest purDeliveryRequest); diff --git a/src/main/java/com/glxp/api/entity/purchase/PurDeliveryEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurDeliveryEntity.java index 824850aa..33c550e6 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurDeliveryEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurDeliveryEntity.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; + /** * 送货单 */ @@ -131,4 +132,7 @@ public class PurDeliveryEntity { */ @TableField(value = "stockOrderNo") private String stockOrderNo; + + @TableField(value = "supId") + private String supId; } diff --git a/src/main/java/com/glxp/api/req/purchase/PurArrivalRequest.java b/src/main/java/com/glxp/api/req/purchase/PurArrivalRequest.java index 99e243f4..7b5e5127 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurArrivalRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurArrivalRequest.java @@ -6,7 +6,7 @@ import lombok.Data; import java.util.Date; @Data -public class PurArrivalRequest extends ListPageRequest { +public class PurArrivalRequest extends ListPageRequest { private Long id; @@ -65,6 +65,6 @@ public class PurArrivalRequest extends ListPageRequest { private String startDate; private String endDate; - private Long applyId; + private Long purDeliveryId; } diff --git a/src/main/java/com/glxp/api/res/purchase/PurDeliveryResponse.java b/src/main/java/com/glxp/api/res/purchase/PurDeliveryResponse.java index 59f87c70..4a0fe3e5 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurDeliveryResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurDeliveryResponse.java @@ -70,4 +70,8 @@ public class PurDeliveryResponse { private String createUserName; private String auditUserName; + + private String supName; + private String supId; + } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 1f97c1a8..5b7500a3 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_spms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: 123456 + password: Glxp@6066 hikari: connection-timeout: 60000 maximum-pool-size: 20 diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 6200a0e0..b7509009 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -3,7 +3,7 @@ server: spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - jdbc-url: jdbc:mysql://127.0.0.1:3306/udi_spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_spms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: Glxp@6066 hikari: diff --git a/src/main/resources/mybatis/mapper/purchase/PurDeliveryDao.xml b/src/main/resources/mybatis/mapper/purchase/PurDeliveryDao.xml index 4a85bb75..5167bcd5 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurDeliveryDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurDeliveryDao.xml @@ -7,12 +7,15 @@ cb.employeeName createUserName, ab.employeeName auditUserName, auth_warehouse.NAME invName, - auth_dept.`name` deptName + auth_dept.`name` deptName, + bc.name supName + FROM pur_delivery LEFT JOIN auth_user cb ON pur_delivery.createUser = cb.id LEFT JOIN auth_user ab ON pur_delivery.auditUser = ab.id LEFT JOIN auth_warehouse ON pur_delivery.invCode = auth_warehouse.`code` LEFT JOIN auth_dept ON auth_dept.CODE = pur_delivery.deptCode + left join basic_corp bc on pur_delivery.supId = bc.erpId AND billNo = #{billNo} diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 5d1bd514..b7860a72 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -33,3 +33,6 @@ CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'expireDate', 'varchar(255) ', 1) CALL Pro_Temp_ColumnWork('pur_returned_detail', 'batchNo', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('pur_returned_detail', 'productDate', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('pur_returned_detail', 'expireDate', 'varchar(255) ', 1); + + +CALL Pro_Temp_ColumnWork('pur_delivery', 'supId', 'varchar(255) ', 1);