From f155b6d5802431cdc52657491cfa9404958c4c5c Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 8 May 2023 12:04:12 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B4=A7=E4=BD=8D=EF=BC=8Cbug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=8D=95=E6=8D=AE=E5=90=8C=E6=AD=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicBussinessTypeEntity.java | 4 +++ .../entity/sync/SyncDataBustypeEntity.java | 5 +++ .../api/idc/controller/IdcController.java | 32 ++++++++++--------- .../res/basic/BasicBussinessTypeResponse.java | 3 ++ .../auth/impl/InvSpaceServiceImpl.java | 2 +- .../inout/impl/IoOrderServiceImpl.java | 4 ++- .../mapper/basic/BasicBussinessTypeDao.xml | 4 +-- .../mapper/system/SyncDataBustypeDao.xml | 4 +-- src/main/resources/schemas/schema_v2.1.sql | 4 +++ 9 files changed, 41 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index cba8e55e..b4d1ccb3 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -408,4 +408,8 @@ public class BasicBussinessTypeEntity { private boolean advancePreIn; @TableField(value = "sortNum") private Integer sortNum; + + //是否按货位出库 0：不按货位出库，1:按货位出库 + @TableField(value = "spaceOut") + private int spaceOut; } diff --git a/src/main/java/com/glxp/api/entity/sync/SyncDataBustypeEntity.java b/src/main/java/com/glxp/api/entity/sync/SyncDataBustypeEntity.java index 12282bc6..e9aaeff2 100644 --- a/src/main/java/com/glxp/api/entity/sync/SyncDataBustypeEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/SyncDataBustypeEntity.java @@ -24,4 +24,9 @@ public class SyncDataBustypeEntity { private Integer orderStatus; //单据状态 @TableField(value = "`direct`") private int direct; //1:UDI管理系统->SPMS 2:SPMS->UDI管理系统 + + @TableField(value = "`syncStatus`") + private Integer syncStatus; //同步后单据状态 + @TableField(value = "`syncChange`") + private Integer syncChange; //同步后是否自动补单 } diff --git a/src/main/java/com/glxp/api/idc/controller/IdcController.java b/src/main/java/com/glxp/api/idc/controller/IdcController.java index adc2218d..8eac70e9 100644 --- a/src/main/java/com/glxp/api/idc/controller/IdcController.java +++ b/src/main/java/com/glxp/api/idc/controller/IdcController.java @@ -53,18 +53,18 @@ public class IdcController { @RequestParam("content") String content, @RequestParam(value = "files", required = false) MultipartFile[] files) { // - return idcService.receive( request, content, files); + return idcService.receive(request, content, files); } @RequestMapping(value = "/spssync/common/once") @ResponseBody - public BaseResponse once(HttpServletRequest request,@RequestBody Map params) { + public BaseResponse once(HttpServletRequest request, @RequestBody Map params) { // - boolean isUpload = params.get("isUpload")!=null && params.get("isUpload").equals("1") ? true : false ; - return idcService.onceSync( params.get("tableName").toString(), isUpload); + boolean isUpload = params.get("isUpload") != null && params.get("isUpload").equals("1") ? true : false; + return idcService.onceSync(params.get("tableName").toString(), isUpload); } - - + + //@Log("数据同步测试") @RequestMapping(value = "/spssync/common/test") public BaseResponse test(HttpServletRequest request, @RequestBody Map params) { @@ -85,17 +85,19 @@ public class IdcController { public BaseResponse download(HttpServletRequest request, @RequestBody Map params) { return idcService.download(request, params); } + @RequestMapping(value = "/spssync/common/uploadStatus") @ResponseBody public BaseResponse uploadStatus(HttpServletRequest request, @RequestBody Map params) { return idcService.uploadStatus(request, params); } - + @RequestMapping(value = "/spssync/common/downloadStatus") @ResponseBody public BaseResponse downloadStatus(HttpServletRequest request, @RequestBody Map params) { return idcService.downloadStatus(request, params); } + //@Log("数据同步任务根据任务ID,返回下载成功标记") @RequestMapping(value = "/spssync/common/success") @ResponseBody @@ -104,15 +106,15 @@ public class IdcController { } @RequestMapping(value = "/spssync/common/downloadFile") - public void downloadFile(HttpServletResponse response,@RequestParam String fileName) throws UnsupportedEncodingException { - if (fileName != null) { - response.setHeader("Content-disposition", "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8")); - response.setContentType("application/force-download"); - idcService.downloadFile(fileName, response); - } - + public void downloadFile(HttpServletResponse response, @RequestParam String fileName) throws UnsupportedEncodingException { + if (fileName != null) { + response.setHeader("Content-disposition", "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8")); + response.setContentType("application/force-download"); + idcService.downloadFile(fileName, response); + } + } - + @RequestMapping("/mapi/**") public Object mapi(HttpServletRequest request, HttpServletResponse httpServletResponse) { String uri = parseUri(request.getRequestURL().toString()); diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index f1a5e85c..ee21da29 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -152,4 +152,7 @@ public class BasicBussinessTypeResponse { private String checkPreInOrders; private Boolean advancePreIn; private Integer sortNum; + + + private int spaceOut; } diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java index a7ce29ae..a9b67d14 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java @@ -59,7 +59,7 @@ public class InvSpaceServiceImpl implements InvSpaceService { //获取当前仓库下的最大货位编码 String maxSpaceCode = invSpaceDao.getMaxSpaceCode(null); if (StrUtil.isBlank(maxSpaceCode)) { - maxSpaceCode = "0000"; + maxSpaceCode = "1000"; } String spaceCode = getSpaceCode(maxSpaceCode); invSpace.setCode(spaceCode); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index b417ef87..52d54744 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -721,7 +721,9 @@ public class IoOrderServiceImpl implements IoOrderService { //查询往来单位名称 if (StrUtil.isNotBlank(order.getFromCorp())) { BasicCorpEntity corpEntity = basicCorpDao.selectByErpId(order.getFromCorp()); - response.setFromCorpName(corpEntity.getName()); + if (corpEntity != null) + response.setFromCorpName(corpEntity.getName()); + } else if (StrUtil.isNotBlank(order.getFromInvCode())) { String fromInvName = invWarehouseDao.selectNameByCode(order.getFromInvCode()); response.setFromCorpName(fromInvName); diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 28f26620..f8e684b1 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -73,7 +73,7 @@ thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp, thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate, checkExpire, checkCertExpire, preInBackAction, backPreinType, checkPreInOrders, - sortNum) + sortNum,spaceOut) values (#{mainAction}, #{action}, #{name}, #{enable}, #{remark}, #{thirdSysFk}, #{genUnit}, #{innerOrder}, #{secCheckEnable}, #{checkEnable}, #{checkUdims}, #{checkPdaEd}, #{checkPdaUn}, #{checkPc}, #{checkWebNew}, #{checkSp}, #{checkChange}, #{secCheckUdims}, #{secCheckPdaEd}, #{secCheckPdaUn}, @@ -86,7 +86,7 @@ #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, #{thrCheckPc}, #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}, #{checkVailDate}, #{checkExpire}, #{checkCertExpire}, #{preInBackAction}, #{backPreinType}, #{checkPreInOrders}, - #{sortNum}) + #{sortNum},#{spaceOut}) + + + select auth_space.code, auth_space.name, iws.name invSubStorageName, iw.name invStorageName from auth_space - left join auth_warehouse iws on iws.code = auth_space.invWarehouseCode - left join auth_dept iw on iw.code = auth_space.invStorageCode + left join auth_warehouse iws on iws.code = auth_space.invWarehouseCode + left join auth_dept iw on iw.code = auth_space.invStorageCode AND auth_space.invStorageCode = #{invStorageCode} @@ -373,7 +374,7 @@