From 915014b5b9389afd307a97c92410e48d050946ec Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 4 Aug 2022 17:56:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1.=E5=8D=95=E6=8D=AE=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=A2=9E=E5=8A=A0=E5=88=86=E5=BA=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/admin/entity/business/StockOrderPrintEntity.java | 1 + .../main/resources/mybatis/mapper/business/StockOrderDao.xml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java index 647c2719..cc55a7bb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java @@ -27,6 +27,7 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity { private BigDecimal totalPrice; private String locInv; + private String subInv; public BigDecimal getPrice() { // if (price == null) 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 e62384fc..d47e8e55 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml @@ -311,11 +311,12 @@ select io_codes.code udiCode,basic_udirel.id productId,basic_products.cpmctymc productName,basic_products.ggxh spec,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count, basic_products.ylqxzcrbarmc,basic_udirel.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh, - inv_warehouse.name locInv,basic_products.spmc, basic_products.cpms + inv_warehouse.name locInv, inv_warehouse_sub.name subInv, basic_products.spmc, basic_products.cpms from io_codes INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid LEFT JOIN inv_warehouse ON io_codes.locStorageCode = inv_warehouse.`code` + left join inv_warehouse_sub on io_codes.invWarehouseCode = inv_warehouse_sub.code and io_codes.orderId =#{orderId} From 644103477543ade77b8a824fcdc9fecede8b0693 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 5 Aug 2022 14:43:59 +0800 Subject: [PATCH 2/5] =?UTF-8?q?1.=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=A1=A5=E5=8D=95=E5=88=A4=E6=96=AD=E5=A2=9E=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=B9=B3=E8=A1=A1=E8=A1=A5=E5=8D=95?= =?UTF-8?q?=E6=9C=89=E6=97=A0=E5=80=BC=E5=88=A4=E6=96=AD=202.=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=A0=E9=99=A4=E5=88=86=E5=BA=93=E6=9C=89=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/InvSubWarehouseController.java | 11 ++++++----- .../api/admin/dao/basic/BussinessTypeDao.java | 8 ++++++++ .../api/admin/dao/inout/WarehouseUserDao.java | 8 ++++++++ .../service/inout/WarehouseUserService.java | 7 +++++++ .../service/inout/impl/OrderServiceImpl.java | 16 +++++++++++++++- .../inout/impl/WarehouseUserServiceImpl.java | 5 +++++ .../mybatis/mapper/basic/BussinessTypeDao.xml | 10 ++++++++++ .../mybatis/mapper/inout/WarehouseUserDao.xml | 5 +++++ 8 files changed, 64 insertions(+), 6 deletions(-) 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 01d9f9b0..3f8df0e7 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 @@ -17,6 +17,7 @@ import com.glxp.api.admin.res.inventory.InvSubWarehouseResponse; import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse; import com.glxp.api.admin.service.auth.CustomerService; import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService; +import com.glxp.api.admin.service.inout.WarehouseUserService; import com.glxp.api.admin.service.inventory.InvProductService; import com.glxp.api.admin.service.inventory.InvSubWarehouseService; import com.glxp.api.admin.service.inventory.InvWarehouseService; @@ -47,6 +48,8 @@ public class InvSubWarehouseController { WarehouseBussinessTypeService warehouseBussinessTypeService; @Resource private InvProductService invProductService; + @Resource + private WarehouseUserService warehouseUserService; @AuthRuleAnnotation("") @GetMapping("spms/sub/inv/warehouse/filter") @@ -143,11 +146,9 @@ public class InvSubWarehouseController { InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.findById(deleteRequest.getId()); - FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); - filterInvWarehouseRequest.setCode(invSubWarehouseEntity.getParentId()); - List warehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest); - if (!warehouseEntities.isEmpty()) { - return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！"); + Integer userCount = warehouseUserService.countUserBySubInvCode(invSubWarehouseEntity.getCode()); + if (userCount > 0) { + return ResultVOUtils.error(500, "请先移除该仓库关联用户！"); } List warehouseBussinessTypeEntities = warehouseBussinessTypeService.getListByCode(invSubWarehouseEntity.getCode()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java index 69ec30f8..15d346f9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java @@ -61,4 +61,12 @@ public interface BussinessTypeDao { * @return */ String selectInoutTypebByLocalAction(@Param("localAction") String localAction); + + /** + * 根据业务单据号查询补单类型 + * + * @param stockOrderBillNo + * @return + */ + String selectSupplementTypeByBillNo(@Param("stockOrderBillNo") String stockOrderBillNo); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java index 5d3f395a..7720be50 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java @@ -52,4 +52,12 @@ public interface WarehouseUserDao { * @param isDirector */ void updateDirectorById(@Param("id") Integer id, @Param("isDirector") int isDirector); + + /** + * 根据分仓编码统计绑定的用户数 + * + * @param code + * @return + */ + Integer countByCode(@Param("code") String code); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java index 3c1d6035..42242e83 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java @@ -57,4 +57,11 @@ public interface WarehouseUserService { */ List getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest); + /** + * 根据分仓编码，统计用户数量 + * + * @param subInvCode + * @return + */ + Integer countUserBySubInvCode(String subInvCode); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java index b4ffdb15..5c05ae22 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java @@ -338,7 +338,7 @@ public class OrderServiceImpl implements OrderService { stockOrderEntityList.forEach(stockOrderEntity -> { StockOrderResponse response = new StockOrderResponse(); BeanUtil.copyProperties(stockOrderEntity, response); - if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER)) { + if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER) && checkBusTypeSupplementOrder(stockOrderEntity.getBillNo())) { response.setEnableSupplementOrder(true); } result.add(response); @@ -346,6 +346,20 @@ public class OrderServiceImpl implements OrderService { return result; } + /** + * 校验扫码单据类型是否绑定了补单类型 + * + * @param stockOrderBillNo 业务单据号 + * @return + */ + boolean checkBusTypeSupplementOrder(String stockOrderBillNo) { + String supplementOrderType = bussinessTypeDao.selectSupplementTypeByBillNo(stockOrderBillNo); + if (StrUtil.isNotBlank(supplementOrderType)) { + return true; + } + return false; + } + @Override public List checkSubmitOrder(List orderResponseList) { if (CollUtil.isEmpty(orderResponseList)) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java index 3b89d00c..8897bfc7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java @@ -116,4 +116,9 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { } return warehouseUserDao.selectListByCode(filterInvLinkDataRequest.getCode()); } + + @Override + public Integer countUserBySubInvCode(String subInvCode) { + return warehouseUserDao.countByCode(subInvCode); + } } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 613069e5..37736d88 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -400,4 +400,14 @@ where localAction = #{localAction} + + diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml index 05bd9503..90b22a52 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml @@ -273,6 +273,11 @@ from inv_warehouse_user where userId = #{userId} + + + delete from inv_warehouse_user From 71d1cf46d72d284b98b204ec301127fb3aba40c5 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Fri, 5 Aug 2022 15:13:06 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=97=B6=E5=90=8C=E6=97=B6=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/business/StockOrderRemakDao.java | 17 ++++++++ .../business/StockOrderRemakEntity.java | 21 ++++++++++ .../api/admin/httpclient/SpGetHttpClient.java | 2 +- .../admin/res/basic/SpsSyncOrderResponse.java | 5 +++ .../glxp/api/admin/thread/DlBasicService.java | 18 ++++++++- .../api/admin/thread/IoTransInoutService.java | 32 ++++++++++----- .../com/glxp/api/admin/util/OkHttpCli.java | 2 +- .../mapper/business/StockOrderRemakDao.xml | 39 +++++++++++++++++++ 8 files changed, 123 insertions(+), 13 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderRemakDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/business/StockOrderRemakDao.xml diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderRemakDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderRemakDao.java new file mode 100644 index 00000000..5b8ad38f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderRemakDao.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.dao.business; + +import com.glxp.api.admin.entity.business.StockOrderRemakEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface StockOrderRemakDao { + + List findByOrderIdFk(@Param("id") String id); + + boolean insertOrderRemaks(@Param("orderRemakEntities") List OrderRemakEntitys); + + boolean deleteByOrderIdFk(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java new file mode 100644 index 00000000..7d92f3d3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.entity.business; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class StockOrderRemakEntity { + private Integer id; + private String orderIdFk; + private String relId; + private String batchNo; + private BigDecimal price; + private String secSalesListNo; + private String firstSalesInvNo; + private String secSalesInvNo; + private String invoiceDate; + private String remark; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java index 1881083a..ff42b243 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java @@ -92,6 +92,7 @@ public class SpGetHttpClient { public BaseResponse> getBasicStatus(String type) { Map paramMap = new HashMap<>(16); paramMap.put("type", type); + paramMap.put("status", "3"); String response = okHttpCli.doGet(getIpUrl() + "/spssync/basic/udiinfo/getStatus", paramMap); try { BaseResponse> data = @@ -149,7 +150,6 @@ public class SpGetHttpClient { basicExportStatusRequest.setType(type); String json = JSONUtil.toJsonStr(basicExportStatusRequest); String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/basic/udiinfo/downloadByStatus", json); -// String result = UHttpClient.postJson(getIpUrl() + "/spssync/basic/udiinfo/downloadByStatus", basicExportStatusRequest); return result; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java index 0265da7e..64fba687 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.res.basic; +import com.glxp.api.admin.entity.business.StockOrderRemakEntity; import com.glxp.api.admin.entity.inout.ErpOrderEntity; import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.inout.WarehouseEntity; @@ -15,4 +16,8 @@ public class SpsSyncOrderResponse { List orderEntities; List orderDetailEntityList; List warehouseEntityList; + + + List stockOrderRemakEntities; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java index e562ea87..aae25435 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java @@ -7,6 +7,7 @@ import com.glxp.api.admin.constant.BasicProcessStatus; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.dao.auth.AuthAdminDao; import com.glxp.api.admin.dao.basic.*; +import com.glxp.api.admin.dao.business.StockOrderRemakDao; import com.glxp.api.admin.dao.inout.CodesTempDao; import com.glxp.api.admin.dao.inout.OrderDao; import com.glxp.api.admin.dao.inout.WarehouseBussinessTypeDao; @@ -17,6 +18,7 @@ import com.glxp.api.admin.dao.thrsys.ThrOrderDetailDao; import com.glxp.api.admin.dao.thrsys.ThrProductsDao; import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.basic.*; +import com.glxp.api.admin.entity.business.StockOrderRemakEntity; import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.api.admin.entity.inout.WarehouseEntity; @@ -94,7 +96,9 @@ public class DlBasicService { @Resource private BussinessTypeService bussinessTypeService; @Resource - private SystemParamConfigService systemParamConfigService; + private StockOrderRemakDao stockOrderRemakDao; + + private static final Logger logger = LoggerFactory.getLogger(DlBasicService.class); //------------------------------------------------------------ @@ -213,6 +217,7 @@ public class DlBasicService { batchSession.commit(); remark.append("往来单位：").append(syncDataResponse.getBasicUnitMaintainEntities().size()).append("条\n"); } catch (Exception e) { + e.printStackTrace(); } } @@ -227,6 +232,7 @@ public class DlBasicService { } batchSession.commit(); } catch (Exception e) { + e.printStackTrace(); } } @@ -244,6 +250,7 @@ public class DlBasicService { batchSession.commit(); remark.append("第三方产品信息：").append(syncDataResponse.getThrProductsEntities().size()).append("条\n"); } catch (Exception e) { + e.printStackTrace(); } } @@ -260,6 +267,7 @@ public class DlBasicService { batchSession.commit(); remark.append("第三方往来单位信息：").append(syncDataResponse.getThrCorpEntities().size()).append("条\n"); } catch (Exception e) { + e.printStackTrace(); } } @@ -275,6 +283,7 @@ public class DlBasicService { batchSession.commit(); remark.append("第三方业务单据：").append(syncDataResponse.getThrOrderEntities().size()).append("条\n"); } catch (Exception e) { + e.printStackTrace(); } } @@ -289,6 +298,7 @@ public class DlBasicService { batchSession.commit(); remark.append("第三方业务单据详情：").append(syncDataResponse.getThrOrderDetailEntities().size()).append("条\n"); } catch (Exception e) { + e.printStackTrace(); } } @@ -508,7 +518,10 @@ public class DlBasicService { } batchSession.commit(); - + if (CollUtil.isNotEmpty(syncDataResponse.getStockOrderRemakEntities())) { + List stockOrderRemakEntities = syncDataResponse.getStockOrderRemakEntities(); + stockOrderRemakDao.insertOrderRemaks(stockOrderRemakEntities); + } String logs = ""; if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) logs = logs + "单据：" + syncDataResponse.getOrderEntities().size() + "条\n"; @@ -518,6 +531,7 @@ public class DlBasicService { logs = logs + "单据条码信息：" + syncDataResponse.getWarehouseEntityList().size() + "条\n"; remark.append(logs); } catch (Exception e) { + e.printStackTrace(); } } batchSession.close(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java index 5fef8b2e..867881dd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java @@ -10,9 +10,11 @@ import com.glxp.api.admin.controller.inout.utils.CheckOrderUtils; import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil; import com.glxp.api.admin.controller.inout.utils.DataTransUtil; import com.glxp.api.admin.controller.inout.utils.InoutUtils; +import com.glxp.api.admin.dao.business.StockOrderRemakDao; import com.glxp.api.admin.entity.basic.*; import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import com.glxp.api.admin.entity.business.StockOrderEntity; +import com.glxp.api.admin.entity.business.StockOrderRemakEntity; import com.glxp.api.admin.entity.info.CompanyEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.inout.ErpOrderEntity; @@ -77,14 +79,10 @@ public class IoTransInoutService { @Resource private OrderDetailService myErpOrderService; - @Resource - BussinessLocalTypeService bussinessLocalTypeService; @Resource UdiRelevanceService udiRelevanceService; @Resource private UdiInfoService udiInfoService; - @Value("${UDI_SERVER_URL}") - private String udiUrl; @Resource private CodesTempService codesTempService; @@ -101,17 +99,15 @@ public class IoTransInoutService { @Resource CompanyProductRelevanceService companyProductRelevanceService; @Resource - CompanyService companyService; - @Resource InvWarehouseService invWarehouseService; @Resource InvProductService invProductService; @Resource InvPreProductService invPreProductService; @Resource - UdiDlHttpClient udiDlHttpClient; - @Resource GennerOrderUtils gennerOrderUtils; + @Resource + StockOrderRemakDao stockOrderRemakDao; @Async public void creatOrderAsycn(PostOrderRequest postOrderRequest, Integer fromType) { @@ -823,7 +819,6 @@ public class IoTransInoutService { stockOrderDetailEntity.setBatchNo(erpOrderEntity.getBatchNo()); stockOrderDetailEntity.setProductDate(erpOrderEntity.getProductDate()); stockOrderDetailEntity.setExpireDate(erpOrderEntity.getExpireDate()); -// stockOrderDetailEntity.setYlqxzcrbarmc(erpOrderEntity.get()); if (erpOrderEntity.getCount() != null) { stockOrderDetailEntity.setSweepCount(erpOrderEntity.getCount()); stockOrderDetailEntity.setReCount(erpOrderEntity.getCount()); @@ -838,6 +833,25 @@ public class IoTransInoutService { stockOrderDetailEntity.setCount(erpOrderEntity.getErpCount()); } + if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDISP) { + + List stockOrderRemakEntities = stockOrderRemakDao.findByOrderIdFk(orderId); + + for (StockOrderRemakEntity stockOrderRemakEntity : stockOrderRemakEntities) { + if (StrUtil.trimToEmpty(stockOrderRemakEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId())) + && + StrUtil.trimToEmpty(stockOrderRemakEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())) + ) { + stockOrderDetailEntity.setPrice(stockOrderRemakEntity.getPrice()); + stockOrderDetailEntity.setSecSalesInvNo(stockOrderRemakEntity.getSecSalesInvNo()); + stockOrderDetailEntity.setFirstSalesInvNo(stockOrderRemakEntity.getFirstSalesInvNo()); + stockOrderDetailEntity.setSecSalesInvNo(stockOrderRemakEntity.getSecSalesInvNo()); + stockOrderDetailEntity.setInvoiceDate(stockOrderRemakEntity.getInvoiceDate()); + } + } + } + + stockOrderDetailEntities.add(stockOrderDetailEntity); } if (!isError) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java b/api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java index 3c01f576..f1aace9d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java +++ b/api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java @@ -97,7 +97,7 @@ public class OkHttpCli { } } - + log.info(sb.toString()); Request request = builder.url(sb.toString()).build(); log.info("do get request and url[{}]", sb.toString()); return execute(request); diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderRemakDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderRemakDao.xml new file mode 100644 index 00000000..faee96f1 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderRemakDao.xml @@ -0,0 +1,39 @@ + + + + + + + + + + insert INTO stock_order_remak( + orderIdFk,batchNo,price,relId + ,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate,remark) + values + + ( + #{item.orderIdFk}, + #{item.batchNo}, + #{item.price},#{item.relId},#{item.firstSalesInvNo},#{item.secSalesInvNo}, + #{item.secSalesListNo},#{item.invoiceDate},#{item.remark} + ) + + + + + + DELETE + FROM stock_order_remak + WHERE orderIdFk = #{id} + + + + \ No newline at end of file From eaa7229cc5e1811399b6082c680dd438d779c224 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 5 Aug 2022 16:02:42 +0800 Subject: [PATCH 4/5] =?UTF-8?q?1.=E4=B8=B4=E6=97=B6=E7=A0=81=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9E=E9=99=85=E6=95=B0=E9=87=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/WareHouseController.java | 13 +++++++++++++ .../api/admin/entity/inout/WarehouseEntity.java | 3 ++- .../mybatis/mapper/inout/CodesTempDao.xml | 17 ++++++++++++----- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 49f1048b..75540bce 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -798,6 +798,19 @@ public class WareHouseController { } else if (udiRelevanceResponse.getIsUseDy() == 0 && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) { return ResultVOUtils.error(500, "该产品不允许以使用单元入库！"); } + + //计算实际数量 + int actCount = 0; + if (udiRelevanceResponse.getIsUseDy() == 1 && udiRelevanceResponse.getDiType() != 2) { + if (udiRelevanceResponse.getBhzxxsbzsl() == 0) { + actCount = udiRelevanceResponse.getZxxsbzbhsydysl(); + } else { + actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getBhzxxsbzsl(); + } + } else { + actCount = udiRelevanceResponse.getBhzxxsbzsl(); + } + warehouseEntity.setReCount(warehouseEntity.getCount() * actCount); } else if (udiRelevanceResponses.size() == 0) { if (unitFk == null) return ResultVOUtils.error(500, "耗材字典不存在此产品！"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java index 6175c1f3..21f9c711 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java @@ -18,7 +18,8 @@ public class WarehouseEntity { private String produceDate; private String expireDate; private String serialNo; - private Integer count; + private Integer count; //扫码数量 + private Integer reCount; //实际数量 private String packageLevel; private String warehouseCode; diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml index e318be9b..f3e86eb3 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml @@ -15,7 +15,7 @@ (`action`, mainAction,code, corpOrderId, actor,actDate, fromCorpId, fromCorp, orderId,batchNo,produceDate,expireDate,serialNo, - `count`,nameCode,supId,invStorageCode,invWarehouseCode,locStorageCode,relId) + `count`, reCount, nameCode,supId,invStorageCode,invWarehouseCode,locStorageCode,relId) VALUES @@ -33,7 +33,9 @@ ,#{item.produceDate} ,#{item.expireDate} ,#{item.serialNo} - ,#{item.count},#{item.nameCode},#{item.supId}, + ,#{item.count} + ,#{item.reCount} + ,#{item.nameCode},#{item.supId}, #{item.invStorageCode},#{item.invWarehouseCode},#{item.locStorageCode},#{item.relId} ) @@ -43,7 +45,7 @@ INSERT INTO io_codes_temp(`action`, mainAction, code, corpOrderId, actor, actDate, fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, serialNo, - `count`, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId) + `count`, reCount, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId) values (#{action}, #{mainAction}, #{code}, @@ -57,7 +59,9 @@ #{produceDate}, #{expireDate}, #{serialNo}, - #{count}, #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}, #{relId}) + #{count}, + #{reCount}, + #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}, #{relId}) @@ -67,7 +71,7 @@ ignore INTO io_codes_temp(`action`, mainAction, code, corpOrderId, actor, actDate, fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, serialNo, - `count`, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId) + `count`, reCount, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId) values ( #{action}, #{mainAction}, @@ -83,6 +87,7 @@ #{expireDate}, #{serialNo}, #{count}, + #{reCount}, #{nameCode}, #{supId}, #{invStorageCode}, @@ -131,6 +136,7 @@ UPDATE io_codes_temp `count`=#{count}, + `reCount`=#{reCount}, `action`=#{action}, `mainAction`=#{mainAction}, `fromCorpId`=#{fromCorpId}, @@ -162,6 +168,7 @@ `serialNo`=#{serialNo}, `relId`=#{relId}, `count`=#{count}, + `reCount`=#{reCount}, WHERE id=#{id} From 8be5da50d63ce73f5ae1fed6796f84cdbd965da5 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 5 Aug 2022 17:43:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1.=E7=A0=81=E8=A1=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E6=95=B0=E9=87=8F=202.=E7=A0=81=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=93=8D=E5=BA=94=E7=B1=BB=E6=95=B0=E6=8D=AE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8D=95=E6=8D=AEID=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/admin/res/inout/WarehouseResponse.java | 1 + .../src/main/resources/mybatis/mapper/inout/CodesDao.xml | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java index cbdc55db..b378b361 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java @@ -16,6 +16,7 @@ public class WarehouseResponse { private long id; private String fromCorp; private Integer count; + private String orderId; private String batchNo; private String produceDate; private String expireDate; diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml index c8f96225..2cd7392b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml @@ -41,7 +41,7 @@ INSERT INTO io_codes(`action`, mainAction, code, corpOrderId, actor, actDate, fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, - serialNo, `count`, packageLevel, warehouseCode, nameCode, supId, relId, status, + serialNo, `count`, reCount, packageLevel, warehouseCode, nameCode, supId, relId, status, invStorageCode, invWarehouseCode, locStorageCode) values (#{action}, #{mainAction}, @@ -51,7 +51,7 @@ #{actDate}, #{fromCorpId}, #{fromCorp}, #{orderId}, #{batchNo}, #{produceDate}, #{expireDate}, #{serialNo}, #{count}, - #{packageLevel}, #{warehouseCode}, + #{reCount}, #{packageLevel}, #{warehouseCode}, #{nameCode}, #{supId}, #{relId}, #{status}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}) @@ -64,7 +64,7 @@ actor, actDate, fromCorpId,fromCorp,orderId,batchNo,produceDate,expireDate, - serialNo,`count`,packageLevel,warehouseCode,nameCode,supId, + serialNo,`count`, reCount, packageLevel,warehouseCode,nameCode,supId, relId,status,invStorageCode,invWarehouseCode,locStorageCode) VALUES fromCorp=#{fromCorp}, fromCorpId=#{fromCorpId}, `count`=#{count}, + `reCount`=#{reCount}, status=#{status}, supId=#{supId}, invStorageCode=#{invStorageCode},