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

Merge remote-tracking branch 'origin/orderChange' into zhairh

Browse Source
zhairh
x_z 2 years ago
parent 49769b13e8 aadc15662a
commit e6839a4caf
18 changed files with 62 additions and 26 deletions
Show Stats Download Patch File Download Diff File

6
api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -298,7 +298,10 @@ public class UdiRelevanceController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
//判断父id不为空就吧值给到id里面防止id变成详情id
if(udiRelevanceResponse.getPid()!=null){
udiRelevanceResponse.setId(udiRelevanceResponse.getPid());
}
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceEntity);
udiRelevanceEntity.setId(udiRelevanceResponse.getId() + "");
@ -319,6 +322,7 @@ public class UdiRelevanceController {
udiInfoEntity.setCpms(udiRelevanceResponse.getCpms());
udiInfoEntity.setPrice(udiRelevanceResponse.getPrice());
udiInfoEntity.setSpmc(udiRelevanceResponse.getSpmc());
udiInfoEntity.setZxxsbzbhsydysl(udiRelevanceResponse.getZxxsbzbhsydysl());
udiInfoEntity.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch());
udiInfoEntity.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire());
udiInfoEntity.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct());

2
api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java
Unescape Escape View File

@ -255,6 +255,7 @@ public class OrderDetailController {
//第三方单据
BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.finByThirdAction(thrOrderEntity.getBillType());
if(bussinessOriginTypeResponse!=null){
stockOrderEntity.setBillType(bussinessOriginTypeResponse.getLocalAction());
stockOrderEntity.setId(null);
stockOrderEntity.setStatus(ConstantStatus.SORDER_ALLOC);//未提交
@ -264,6 +265,7 @@ public class OrderDetailController {
stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交
stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印
stockOrderEntity.setBilldate(DateUtil.formatDate(new Date()));
}
boolean b = stockOrderService.insertStockOrder(stockOrderEntity);
stockOrderEntity = stockOrderService.findByBillNo(billNo);
FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();

49
api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java
Unescape Escape View File

@ -61,6 +61,8 @@ public class SupCompanyController {
BasicUnitMaintainService basicUnitMaintainService;
@Resource
SupCertSetService supCertSetService;
@Resource
SupCompanyService supCompanyService;
@AuthRuleAnnotation("")
@GetMapping("/api/pur/getSupComapnys")
@ -79,23 +81,46 @@ public class SupCompanyController {
public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) {
//查询该用户对应的资质证书
//判断是不是存在草稿
if(companyEntity.getAuditStatus()==6){
FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
filterSupCertRequest.setCustomerId(companyEntity.getCustomerId());
filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY);
List<SupCertEntity> supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest);
if(supCertEntityList.size()>0){
for (SupCertEntity obj:supCertEntityList){
if (StrUtil.isBlank(obj.getFilePath())){
return ResultVOUtils.error(999,obj.getName()+"未上传资质证书！");
}
List<SupCertEntity> supCertEntityList = supCertService.findAll(companyEntity.getCustomerId()); for(SupCertEntity obj:supCertEntityList){
if(obj.getAuditStatus()==0){
return ResultVOUtils.error(999,"证书中存在草稿不允许提交！");
}
}
}
//提交审核
FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY);
filterCertSetsRequest.setNeed(1);
List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
//验证
ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
while (iterable.hasNext()) {
SupCertSetEntity supCertSetEntity = iterable.next();
if (supCertSetEntity.isNeed()) {
for (SupCertEntity supCertEntity : supCertEntityList) {
if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
iterable.remove();
break;
}
}
}
}
}
String errMsg = "";
if (supCertSetEntities.size() > 0) {
for (SupCertSetEntity supCertSetEntity : supCertSetEntities) {
errMsg = errMsg + "," + supCertSetEntity.getName();
}
return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！");
}
}
String customerId = CustomUtil.getId(); //重新生成customerId
CustomerContactEntity customerContactEntity = new CustomerContactEntity();
@ -282,7 +307,7 @@ public class SupCompanyController {
@AuthRuleAnnotation("")
@PostMapping("api/pur/supCompany/delete")
public BaseResponse deleteSupCompany(@RequestBody DeleteRequest deleteRequest) {
boolean b = customerContactService.deleteById(Long.parseLong(deleteRequest.getId()));
boolean b = supCompanyService.deleteCompany(deleteRequest.getId());
if (b)
return ResultVOUtils.success("删除成功");
else {

2
api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupContactController.java
Unescape Escape View File

@ -52,7 +52,7 @@ public class SupContactController {
@AuthRuleAnnotation("")
@GetMapping("salewarehouse/customerContact/delete")
public BaseResponse deleteContact(DeleteRequest deleteRequest) {
boolean b = customerContactService.deleteById(Long.parseLong(deleteRequest.getId()));
boolean b = customerContactService.deleteById(deleteRequest.getId());
if (b)
return ResultVOUtils.success("删除成功");
else {

2
api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CustomerContacDao.java
Unescape Escape View File

@ -16,7 +16,7 @@ public interface CustomerContacDao {
boolean updateCustomerContact(CustomerContactEntity customerContactEntity);
boolean deleteById(Long customerId);
boolean deleteById(String customerId);
CustomerContactEntity selectById(Long customerId);

2
api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCompanyDao.java
Unescape Escape View File

@ -23,6 +23,6 @@ public interface SupCompanyDao {
boolean insertCompany(SupCompanyEntity companyEntity);
boolean deleteCompany(Long customerId);
boolean deleteCompany(String customerId);
}

2
api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java
Unescape Escape View File

@ -52,7 +52,7 @@ public class StockOrderEntity {
private String dept;
private String deptName;
private Boolean noInvOut;
private String reviewUserName;
}

2
api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java
Unescape Escape View File

@ -30,6 +30,6 @@ public class StockOrderPostRequest {
private String deptCode;
private BigDecimal price;
private String unitIdFk;
private Boolean noInvOut;
private Integer editStatus;
}

1
api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java
Unescape Escape View File

@ -89,6 +89,7 @@ public class UdiRelevanceResponse {
private Integer rlId;
private Boolean useMuti; //是否多次使用
private Integer useNum; //最小包装单元可使用次数
private Integer pid; //用来存父id
public int getBhzxxsbzsl() {

2
api-admin/src/main/java/com/glxp/api/admin/service/purchase/CustomerContactService.java
Unescape Escape View File

@ -15,7 +15,7 @@ public interface CustomerContactService {
boolean updateCustomerContact(CustomerContactEntity customerContactEntity);
boolean deleteById(Long id);
boolean deleteById(String id);
boolean deleteContact(DeleteRequest deleteRequest);

2
api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java
Unescape Escape View File

@ -24,5 +24,5 @@ public interface SupCompanyService {
boolean insertCompany(SupCompanyEntity companyEntity);
boolean deleteCompany(Long customerId);
boolean deleteCompany(String customerId);
}

2
api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CustomerContactServiceImpl.java
Unescape Escape View File

@ -40,7 +40,7 @@ public class CustomerContactServiceImpl implements CustomerContactService {
}
@Override
public boolean deleteById(Long id) {
public boolean deleteById(String id) {
return customerContacDao.deleteById(id);
}

2
api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCompanyServiceImpl.java
Unescape Escape View File

@ -80,7 +80,7 @@ public class SupCompanyServiceImpl implements SupCompanyService {
@Override
public boolean deleteCompany(Long customerId) {
public boolean deleteCompany(String customerId) {
return supCompanyDao.deleteCompany(customerId);
}
}

5
api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
Unescape Escape View File

@ -30,7 +30,7 @@
thirdSysFk, status, statusInfo, `type`, sourceType,
printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk,
totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd, auditTime,
updateTime, invWarehouseCode, fromSubInvCode, dept)
updateTime, invWarehouseCode, fromSubInvCode, dept, noInvOut)
values (#{id},
#{billNo},
#{billdate},
@ -45,7 +45,7 @@
#{sourceType},
#{printStatus}, #{unitIdFk}, #{customerId}, #{thirdOrderFk}, #{orderIdFk}, #{totalPrice},
#{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd}, #{auditTime},
#{updateTime}, #{invWarehouseCode}, #{fromSubInvCode}, #{dept})
#{updateTime}, #{invWarehouseCode}, #{fromSubInvCode}, #{dept} ,#{noInvOut})
</insert>
<update id="updateById" parameterType="com.glxp.api.admin.entity.business.StockOrderEntity">
UPDATE stock_order
@ -77,6 +77,7 @@
<if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
<if test="fromSubInvCode != null">fromSubInvCode=#{fromSubInvCode},</if>
<if test="dept != null">dept=#{dept},</if>
<if test="noInvOut != null">noInvOut=#{noInvOut},</if>
</trim>
WHERE id = #{id}
</update>

2
api-admin/src/main/resources/mybatis/mapper/purchase/CustomerContactDao.xml
Unescape Escape View File

@ -38,7 +38,7 @@
WHERE customerId=#{customerId}
</update>
<delete id="deleteById" parameterType="java.lang.Long">
<delete id="deleteById" parameterType="java.lang.String">
delete
from customer_contact
where customerId = #{customerId}

1
api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
Unescape Escape View File

@ -40,6 +40,7 @@
<if test="supId != '' and supId != null">
AND supId = #{supId}
</if>
GROUP BY productId
</where>
</select>

2
api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml
Unescape Escape View File

@ -49,7 +49,7 @@
</if>
</where>
</select>
<delete id="deleteCompany" parameterType="java.lang.Long">
<delete id="deleteCompany" parameterType="java.lang.String">
delete
from sup_company
where customerId = #{customerId}

2
api-admin/src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -2,11 +2,13 @@
CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ', 1);
CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1);
CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1);
CALL Pro_Temp_ColumnWork ('stock_order','noInvOut','tinyint ', 1);
CALL Pro_Temp_ColumnWork ('sup_cert','filePath','varchar(255) ', 2);
-- 创建表时必须 create table if not exists 表名
CREATE TABLE if not exists `device_collect_order` (
`id` int NOT NULL AUTO_INCREMENT COMMENT 'id',

Write Preview
Loading…
Cancel
Save