diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java index 9fcfcec..bf90e07 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java @@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @RestController @@ -94,6 +95,7 @@ public class BussinessOriginTypeController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } if (bussinessTypeEntity != null) { + bussinessTypeEntity.setUpdateTime(new Date()); bussinessOriginTypeService.updateBusOriginType(bussinessTypeEntity); } else { ResultVOUtils.error(999, "参数错误"); @@ -113,6 +115,7 @@ public class BussinessOriginTypeController { if (bussinessOriginTypeEntity != null) { return ResultVOUtils.error(500, "单据类型已存在！"); } + bussinessTypeEntity.setUpdateTime(new Date()); bussinessOriginTypeService.insertBusOriginType(bussinessTypeEntity); } else { return ResultVOUtils.error(999, "参数错误"); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java index bdde496..7bec885 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java @@ -127,7 +127,7 @@ public class SpsSyncDownloadController { if (CollUtil.isNotEmpty(baseResponse.getData().getOrderEntities())) { for (OrderEntity orderEntity : baseResponse.getData().getOrderEntities()) { - orderService.updateOrderStatus(orderEntity.getId(), 1); + orderService.updateExportStatus(orderEntity.getId(), 1); } } SpsSyncOrderResponse spsSyncOrderResponse = baseResponse.getData(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyCertController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyCertController.java index df3aceb..5398d59 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyCertController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyCertController.java @@ -81,8 +81,8 @@ public class CompanyCertController { @AuthRuleAnnotation("") @PostMapping("/sale/info/insertCompanyCert") public BaseResponse insertCompanyCert(@RequestBody CompanyCertEntity companyCertEntity) { - companyCertEntity.setCreate_time(new Date()); - companyCertEntity.setUpdate_time(new Date()); + companyCertEntity.setCreateTime(new Date()); + companyCertEntity.setUpdateTime(new Date()); boolean b = companyCertService.insertCompanyCert(companyCertEntity); return ResultVOUtils.success("成功"); } @@ -99,7 +99,7 @@ public class CompanyCertController { @PostMapping("/sale/info/deleteCompanyCert") public BaseResponse deleteCompanyCert(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { boolean b = companyCertService.deleteById(deleteCompanyFileRequest.getId()); - String URL = filePath+"/register/file/image2/" + deleteCompanyFileRequest.getFilePath(); + String URL = filePath + "/register/file/image2/" + deleteCompanyFileRequest.getFilePath(); File file = new File(URL); if (file.exists() && file.isFile()) { file.delete(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index dd7dda0..4643389 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -638,7 +638,7 @@ public class WareHouseController { //批次号校验 if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) { - return ResultVOUtils.error(500, "批次号不能为空！"); + return ResultVOUtils.error(500, "序列号与批次号不能同时为空！"); } String orderId = addOrderRequest.getOrderId(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyCertEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyCertEntity.java index bfae008..3ad6afb 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyCertEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyCertEntity.java @@ -5,6 +5,8 @@ import lombok.Data; import java.util.Date; +//供应商企业资质表 + @Data public class CompanyCertEntity { @@ -14,6 +16,11 @@ public class CompanyCertEntity { private String filePath; private String remark; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date create_time; - private Date update_time; + private Date createTime; + private Date updateTime; + private Date vailDate; + private Date expireDate; + private Integer type; //证书类型：1:供应商；2.生产企业；3.产品品种 + private Integer manufacturersIdFk; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java index ab51cd2..162c56a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java @@ -25,6 +25,8 @@ public class PostUdimsOrderRequest { private String fromCorpId; private String fromCorp; private String remark; + private String invStorageCode; + private String invWarehouseCode; private List codes; private List orderDetails; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index ce0692b..863aacf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -258,10 +258,9 @@ public class IoTransInoutService { orderEntity.setReviewUser(null); orderEntity.setSignStatus(ConstantStatus.ORDER_SIGN_UN); orderEntity.setCustomerId(postUdimsOrderRequest.getCustomerId()); - InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(false, true); - orderEntity.setLocStorageCode(invWarehouseEntity.getCode()); -// orderEntity.setInvWarehouseCode(); - orderEntity.setInvStorageCode(invWarehouseEntity.getCode()); +// InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(false, true); + orderEntity.setLocStorageCode(orderBean.getInvStorageCode()); + orderEntity.setInvStorageCode(orderBean.getInvStorageCode()); orderEntity.setUpdateTime(new Date()); BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction()); String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); @@ -278,8 +277,9 @@ public class IoTransInoutService { warehouseEntity.setFromCorpId(companyEntity.getUnitIdFk()); warehouseEntity.setMainAction(orderEntity.getMainAction()); warehouseEntity.setAction(orderEntity.getAction()); - warehouseEntity.setLocStorageCode(invWarehouseEntity.getCode()); - warehouseEntity.setInvStorageCode(invWarehouseEntity.getCode()); + warehouseEntity.setLocStorageCode(orderEntity.getInvStorageCode()); + warehouseEntity.setInvStorageCode(orderEntity.getInvStorageCode()); + warehouseEntity.setInvWarehouseCode(orderEntity.getInvWarehouseCode()); warehouseEntity.setSupId(orderEntity.getFromCorpId()); warehouseEntity.setRelId(null); warehouseEntity.setOrderId(orderId); diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index c7bd406..d3db546 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,9 +1,9 @@ # \u751F\u4EA7\u73AF\u5883 server.port=9906 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3360/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -spring.datasource.password=root +spring.datasource.password=123456 spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.maximum-pool-size=60 spring.datasource.hikari.minimum-idle=10 @@ -28,8 +28,8 @@ spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.time-zone=GMT+8 spring.main.allow-bean-definition-overriding=true spring.redis.database=4 -spring.redis.host=192.168.0.66 -spring.redis.port=6400 +spring.redis.host=127.0.0.1 +spring.redis.port=6379 spring.redis.password= spring.redis.jedis.pool.max-active=8 spring.redis.jedis.pool.max-wait=-1 diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties index 05988ff..3b2734a 100644 --- a/api-admin/src/main/resources/application-pro.properties +++ b/api-admin/src/main/resources/application-pro.properties @@ -4,67 +4,31 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root spring.datasource.password=Glxp@6066 -#spring.datasource.password=123456 spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.maximum-pool-size=60 spring.datasource.hikari.minimum-idle=10 -#server.servlet.context-path= -#logging.level.com.glxp.sale.admin.dao=debug -# \u8DE8\u57DF\u8BBE\u7F6E cors.allowed-origins=* cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN cors.allowed-methods=GET,POST,PUT,DELETE,PATCH,OPTIONS cors.allowed-Credentials=true -#\u8BF7\u6C42\u53C2\u6570\u957F\u5EA6 server.tomcat.max-http-form-post-size=100MB server.max-http-header-size=100MB -#\u6700\u5927\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F(10MB) spring.servlet.multipart.max-file-size=200MB spring.servlet.multipart.max-request-size=200MB server.connectionTimeout=180000 logging.level.com.glxp.sale.admin.dao=debug -logging.level.com.glxp.api.admin.dao.auth=debug -logging.level.com.glxp.api.admin.dao.basic=debug -logging.level.com.glxp.api.admin.dao.business=debug -logging.level.com.glxp.api.admin.dao.info=debug -logging.level.com.glxp.api.admin.dao.inout=debug -logging.level.com.glxp.api.admin.dao.inventory=debug -logging.level.com.glxp.api.admin.dao.thrsys=debug #file_path=/home/glxpdata/udiwms file_path=D:/glxpdata/udiwms -#UDI\u6570\u636E\u4E0B\u8F7D UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test -#UDI_SERVER_URL=http://127.0.0.1:9994 -#UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server -#UCLOD\u670D\u52A1 -#UCLOD_SERVER_URL=http://127.0.0.1:9997 -#UCLOD_SERVER_URL=http://127.0.0.1:8080/UDIC_UCLOUD_SERVER -UCLOD_SERVER_URL=http://139.9.178.73/UDIC_UCLOUD_SERVER -#mips\u670D\u52A1\u5730\u5740 -UDIC_MIPSDOWNLOAD_URL=http://127.0.0.1:8080/UDIC_MIPSDL_Server -#UDIC_MIPSDOWNLOAD_URL = http://127.0.0.1:9997 -UDIC_U8_URL="https://api.yonyoucloud.com/apis/u8c/uapbd/invmandoc_query" -#\u534F\u8C03\u5E73\u53F0\u5BA2\u6237\u7AEF\u5730\u5740 -COOR_UPLOAD_ORDER=http://127.0.0.1:9987/udi/upload -#\u5185\u5B58\u7801\u751F\u6210 -STOCK_PRINT_POST=http://139.159.187.130/UDI_WMS_MC/udiwms/stockprint/post spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.time-zone=GMT+8 spring.main.allow-bean-definition-overriding=true -# Redis \u6570\u636E\u5E93\u7F16\u53F7 spring.redis.database=4 -# Redis \u670D\u52A1\u5668IP spring.redis.host=127.0.0.1 -# Redis \u7AEF\u53E3\u53F7 spring.redis.port=6379 -# Redis \u5BC6\u7801 spring.redis.password= -#\u6700\u5927\u6D3B\u8DC3\u8FDE\u63A5\u6570 spring.redis.jedis.pool.max-active=8 -#\u6700\u5927\u7B49\u5F85\u65F6\u95F4 spring.redis.jedis.pool.max-wait=-1 -#\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\u6570 spring.redis.jedis.pool.max-idle=8 -#\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\u6570 spring.redis.jedis.pool.min-idle=0 \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml index e3ddba2..844f742 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml @@ -84,14 +84,14 @@ parameterType="com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity"> replace INTO basic_bustype_origin - (`action`, `name`, enable, remark, thirdSys, thirdSysName) + (`action`, `name`, enable, remark, thirdSys, thirdSysName,updateTime) values ( #{action}, #{name}, #{enable}, #{remark}, #{thirdSys}, - #{thirdSysName} + #{thirdSysName},#{updateTime} ) @@ -105,6 +105,8 @@ thirdSys = #{thirdSys}, thirdSysName = #{thirdSysName}, remark = #{remark}, + updateTime = #{updateTime}, + WHERE id = #{id} 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 e646a0d..52ed4f5 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -228,8 +228,13 @@ #{prefix}, #{ullageFill}, #{scanPreIn}, - #{vailInv},#{codeFillCheck},#{defaultSubInv},#{defaultInv},#{orderVisibleType}, - #{checkCopy},#{secCheckCopy} + #{vailInv}, + #{codeFillCheck}, + #{defaultSubInv}, + #{defaultInv}, + #{orderVisibleType}, + #{checkCopy}, + #{secCheckCopy} ) @@ -283,7 +288,13 @@ #{prefix}, #{ullageFill}, #{scanPreIn}, - #{vailInv},#{codeFillCheck},#{defaultSubInv},#{defaultInv},#{orderVisibleType}, #{checkCopy},#{secCheckCopy} + #{vailInv}, + #{codeFillCheck}, + #{defaultSubInv}, + #{defaultInv}, + #{orderVisibleType}, + #{checkCopy}, + #{secCheckCopy} ) @@ -379,13 +390,15 @@ select supplementOrderType from basic_bussiness_type where action = (select action - from io_order - where id = (select orderIdFk - from stock_order - where billNo = #{stockOrderBillNo})) + from io_order + where id = (select orderIdFk + from stock_order + where billNo = #{stockOrderBillNo})) diff --git a/api-admin/src/main/resources/mybatis/mapper/info/CompanyCertDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/CompanyCertDao.xml index cb466b7..217f80d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/CompanyCertDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanyCertDao.xml @@ -16,12 +16,16 @@