UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
dev
郑明梁 2 years ago
parent 1ca7ac05f5 c50bd49100
commit cda3602f74
17 changed files with 269 additions and 162 deletions
Show Stats Download Patch File Download Diff File

7
src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java
Unescape Escape View File

@ -0,0 +1,7 @@
package com.glxp.api.controller.basic;
import org.springframework.web.bind.annotation.RestController;
@RestController
public class BasicDestinyRelController {
}

8
src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java
Unescape Escape View File

@ -278,7 +278,6 @@ public class BasicProductCategoryController {
}
@GetMapping("/udiwms/basic/product/category/SelcetproductList")
public BaseResponse SelectproductList(FilterUdiRelRequest filterUdiRelRequest) {
@ -343,7 +342,6 @@ public class BasicProductCategoryController {
}
@GetMapping("/udiwms/basic/product/category/deleterel")
public BaseResponse deleterel(Integer id) {
basicProductCategoryService.deleterelByid(id);
@ -351,12 +349,6 @@ public class BasicProductCategoryController {
}
@PostMapping("/udiwms/basic/product/category/unbindRel")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse unbindRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {

23
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -28,6 +28,7 @@ import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.api.entity.thrsys.ThrOrderEntity;
import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.req.inout.*;
import com.glxp.api.req.inv.FilterInvoiceRequest;
import com.glxp.api.req.system.DeleteRequest;
@ -59,10 +60,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
/**
* 单据业务详情
@ -253,7 +251,8 @@ public class IoOrderDetailBizController extends BaseController {
orderEntity.setUpdateUser(authAdmin.getId() + "");
orderEntity.setUpdateTime(new Date());
orderEntity.setCustomerId(authAdmin.getCustomerId() + "");
orderEntity.setCorpOrderId(thrOrderEntity.getBillNo());
long random = Calendar.getInstance().getTimeInMillis();
orderEntity.setCorpOrderId(random+"");
orderEntity.setAction(bussinessTypeEntity.getAction());
orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
orderEntity.setFromThrBillNo(thrOrderEntity.getBillNo());
@ -298,7 +297,7 @@ public class IoOrderDetailBizController extends BaseController {
UdiRlSupResponse udiRelevanceResponse = null;
if (udiRelevanceEntities.size() == 1) {
udiRelevanceResponse = udiRelevanceEntities.get(0);
ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId());
ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getRlId());
ioOrderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid());
ioOrderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode());
ioOrderDetailBizEntity.setCoName(udiRelevanceResponse.getCpmctymc());
@ -312,7 +311,7 @@ public class IoOrderDetailBizController extends BaseController {
}
ioOrderDetailBizEntity.setSupId(udiRelevanceResponse.getCustomerId() + "");
} else {
ioOrderDetailBizEntity.setCoName(thrOrderDetailEntity.getCorpName());
ioOrderDetailBizEntity.setCoName(thrOrderDetailEntity.getProductName());
ioOrderDetailBizEntity.setCertCode(thrOrderDetailEntity.getZczbhhzbapzbh());
ioOrderDetailBizEntity.setYlqxzcrbarmc(thrOrderDetailEntity.getYlqxzcrbarmc());
ioOrderDetailBizEntity.setManufacturer(thrOrderDetailEntity.getManufactory());
@ -321,7 +320,7 @@ public class IoOrderDetailBizController extends BaseController {
if (udiRelevanceEntities.size() > 1) {
String bindRlIds = "";
for (UdiRlSupResponse temp : udiRelevanceEntities) {
bindRlIds = bindRlIds + "," + temp.getId();
bindRlIds = bindRlIds + "," + temp.getRlId();
}
ioOrderDetailBizEntity.setBindRlIds(bindRlIds.substring(1));
}
@ -547,10 +546,16 @@ public class IoOrderDetailBizController extends BaseController {
IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(bizBindUpdateRequest.getId());
FilterUdiRelRequest filterUdiRelRequest=new FilterUdiRelRequest();
filterUdiRelRequest.setId(bizBindUpdateRequest.getBindRlFk());
UdiRelevanceResponse udiRelevanceResponse=udiRelevanceService.selectOneUdi(filterUdiRelRequest);
if (bizBindUpdateRequest.getBindRlFk() != null)
orderDetailBizEntity.setBindRlFk(bizBindUpdateRequest.getBindRlFk());
if(udiRelevanceResponse!=null){
orderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode());
orderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid());
}
if (StrUtil.isNotEmpty(bizBindUpdateRequest.getSupId())) {
orderDetailBizEntity.setSupId(bizBindUpdateRequest.getSupId());
}

12
src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java
Unescape Escape View File

@ -84,7 +84,7 @@ public class IoOrderMutiController {
if (udiProductEntity.getUseMuti() == null || udiProductEntity.getUseMuti() == false) {
return ResultVOUtils.error(999, "该产品不允许多次出库！");
} else {
if (udiProductEntity.getZdcfsycs() == null || udiProductEntity.getZdcfsycs().equals(0)) {
if (udiProductEntity.getUseNum() == null || udiProductEntity.getUseNum().equals(0)) {
return ResultVOUtils.error(999, "该产品库存不足！");
}
}
@ -121,11 +121,11 @@ public class IoOrderMutiController {
ioOrderMutiEntityOne.setBatchNo(udiEntity.getBatchNo());
ioOrderMutiEntityOne.setExpireDate(udiEntity.getExpireDate());
ioOrderMutiEntityOne.setProduceDate(udiEntity.getProduceDate());
ioOrderMutiEntityOne.setTotalCount(udiProductEntity.getZdcfsycs());
ioOrderMutiEntityOne.setTotalCount(udiProductEntity.getUseNum());
ioOrderMutiEntityOne.setStatus(0);
ioOrderMutiEntityOne.setCreateUser(customerService.getUserId() + "");
ioOrderMutiEntityOne.setUseCount(0);
ioOrderMutiEntityOne.setReCount(udiProductEntity.getZdcfsycs());
ioOrderMutiEntityOne.setReCount(udiProductEntity.getUseNum());
ioOrderMutiEntityOne.setCreateTime(new Date());
ioOrderMutiEntityOne.setUpdateTime(new Date());
ioOrderMutiEntityOne.setNameCode(udiProductEntity.getNameCode());
@ -175,7 +175,7 @@ public class IoOrderMutiController {
if (udiProductEntity.getUseMuti() == null || udiProductEntity.getUseMuti() == false) {
return ResultVOUtils.error(999, "该产品不允许多次出库！");
} else {
if (udiProductEntity.getZdcfsycs() == null || udiProductEntity.getZdcfsycs().equals(0)) {
if (udiProductEntity.getUseNum() == null || udiProductEntity.getUseNum().equals(0)) {
return ResultVOUtils.error(999, "该产品库存不足！");
}
}
@ -200,10 +200,10 @@ public class IoOrderMutiController {
ioOrderMutiEntity1.setBatchNo(udiEntity.getBatchNo());
ioOrderMutiEntity1.setExpireDate(udiEntity.getExpireDate());
ioOrderMutiEntity1.setProduceDate(udiEntity.getProduceDate());
ioOrderMutiEntity1.setTotalCount(udiProductEntity.getZdcfsycs());
ioOrderMutiEntity1.setTotalCount(udiProductEntity.getUseNum());
ioOrderMutiEntity1.setStatus(0);
ioOrderMutiEntity1.setUseCount(0);
ioOrderMutiEntity1.setReCount(udiProductEntity.getZdcfsycs());
ioOrderMutiEntity1.setReCount(udiProductEntity.getUseNum());
ioOrderMutiEntity1.setCreateUser(customerService.getUserId() + "");
ioOrderMutiEntity1.setCreateTime(new Date());
ioOrderMutiEntity1.setUpdateTime(new Date());

10
src/main/java/com/glxp/api/controller/inout/PlatformController.java
Unescape Escape View File

@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
import javax.security.auth.AuthPermission;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -54,6 +55,15 @@ public class PlatformController {
return ResultVOUtils.error(500, "删除失败");
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/platform/delect")
public BaseResponse delect(@RequestBody PlatformEntity platformEntity) {
if (platformService.remove(platformEntity.getId())>0) {
ResultVOUtils.success("删除成功");
}
return ResultVOUtils.error(500, "删除失败");
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/platform/update")

6
src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java
Unescape Escape View File

@ -202,10 +202,14 @@ public class ThrProductsController {
if (StrUtil.isNotEmpty(value) && value.equals("1")) {
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(thrProductsEntity.getCode());
if (udiProductEntity != null) {
if (StrUtil.isNotEmpty(thrProductsEntity.getName()))
udiProductEntity.setCpmctymc(thrProductsEntity.getName());
if (StrUtil.isNotEmpty(thrProductsEntity.getMeasname()))
udiProductEntity.setMeasname(thrProductsEntity.getMeasname());
if (StrUtil.isNotEmpty(thrProductsEntity.getSpec()))
udiProductEntity.setGgxh(thrProductsEntity.getSpec());
else if (StrUtil.isNotEmpty(thrProductsEntity.getStandard()))
udiProductEntity.setGgxh(thrProductsEntity.getStandard());
if (StrUtil.isNotEmpty(thrProductsEntity.getRegisterNo()))
udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
if (StrUtil.isNotEmpty(thrProductsEntity.getManufactory()))
@ -228,8 +232,6 @@ public class ThrProductsController {
udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getYlqxzcrbarmc());
if (StrUtil.isNotEmpty(thrProductsEntity.getCpms()))
udiProductEntity.setCpms(thrProductsEntity.getCpms());
if (StrUtil.isNotEmpty(thrProductsEntity.getStandard()))
udiProductEntity.setGgxh(thrProductsEntity.getStandard());
udiProductService.updateUdiInfo(udiProductEntity);
}

9
src/main/java/com/glxp/api/dao/basic/BasicDestinyRelMapper.java
Unescape Escape View File

@ -0,0 +1,9 @@
package com.glxp.api.dao.basic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.basic.BasicDestinyRel;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface BasicDestinyRelMapper extends BaseMapper<BasicDestinyRel> {
}

35
src/main/java/com/glxp/api/entity/basic/BasicDestinyRel.java
Unescape Escape View File

@ -0,0 +1,35 @@
package com.glxp.api.entity.basic;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
* 定数包产品关联表
*/
@Data
@TableName(value = "udi_wms.basic_destiny_rel")
public class BasicDestinyRel {
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* 耗材产品id
*/
@TableField(value = "relId")
private Long relId;
/**
* 定数包模板id
*/
@TableField(value = "pId")
private Long pId;
/**
* 数量
*/
@TableField(value = "`count`")
private Integer count;
}

1
src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
Unescape Escape View File

@ -95,5 +95,6 @@ public class UdiProductEntity {
private String mjfs;
private String categoryName;
private Date updateTime;
private Integer useNum;
}

2
src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java
Unescape Escape View File

@ -64,5 +64,5 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
private String basicPrductRemak6;
private String basicPrductRemak7;
private String basicPrductRemak8;
private String category;
}

1
src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
Unescape Escape View File

@ -72,6 +72,7 @@ public class FilterUdiRelRequest extends ListPageRequest {
private String tyshxydm;
private Boolean dispatch;
private Boolean groupBuy;
private String category;
private List<String> uuids;
private List<Long> ids;

17
src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.res.thrsys;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
@ -51,4 +52,20 @@ public class ThrProductsResponse {
private String manufactoryCode;
private String supCode;
public String getSpec() {
if(StrUtil.isNotEmpty(spec)){
return spec;
}
if(StrUtil.isNotEmpty(standard)){
return standard;
}
if(StrUtil.isNotEmpty(model)){
return model;
}
return "";
}
}

7
src/main/java/com/glxp/api/service/basic/BasicDestinyRelService.java
Unescape Escape View File

@ -0,0 +1,7 @@
package com.glxp.api.service.basic;
import org.springframework.stereotype.Service;
public interface BasicDestinyRelService{
}

16
src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml
Unescape Escape View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.basic.BasicDestinyRelMapper">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicDestinyRel">
<!--@mbg.generated-->
<!--@Table udi_wms.basic_destiny_rel-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="relId" jdbcType="BIGINT" property="relId" />
<result column="pId" jdbcType="BIGINT" property="pId" />
<result column="count" jdbcType="INTEGER" property="count" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, relId, pId, `count`
</sql>
</mapper>

2
src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
Unescape Escape View File

@ -1098,7 +1098,7 @@
<select id="selectUdiByName" resultType="com.glxp.api.entity.basic.UdiProductEntity">
SELECT b1.*,
b2.useMuti as useMuti,
b2.zdcfsycs as zdcfsycs,
b2.useNum as useNum,
b2.id as relId,
c1.customerId as supId
FROM basic_products b1

6
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -197,11 +197,15 @@
left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
left join basic_hosp_type bht on basic_udirel.relCode = bht.code
left join thr_products tp on tp.code = basic_udirel.mainId
left join basic_product_category_rel on basic_product_category_rel.relId = basic_udirel.id
left join basic_product_category on basic_product_category_rel.code = basic_product_category.code
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND basic_products.ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
</if>
<if test="category != '' and category != null">
AND basic_product_category.name = #{category}
</if>
<if test="manufactory != '' and manufactory != null">
AND basic_products.manufactory LIKE concat('%', #{manufactory}, '%')
</if>

5
src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -511,6 +511,7 @@ CALL Pro_Temp_ColumnWork('basic_products', 'syqsfxyjxmj', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'mjfs', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'categoryName', 'varchar(255)', 1);
INSERT ignore INTO `sys_param_config`(`parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`,
INSERT ignore INTO `sys_param_config`(id, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
`paramType`,
`paramExplain`, `updateTime`)
VALUES (0, '是否允许编辑第三方产品信息', 'enable_edit_third', '1', 0, 0, '0：否；1：是', NULL);
VALUES (20059, 0, '是否允许编辑第三方产品信息', 'enable_edit_third', '1', 0, 0, '0：否；1：是', NULL);

Write Preview
Loading…
Cancel
Save