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

登录，业务单据修改

Browse Source
master
anthonyywj2 3 years ago
parent b57d1badbb
commit c91af9cfb3
16 changed files with 111 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -430,7 +430,9 @@ public class StockOrderDetailController {
}
filterUdiInfoRequest.setDiType(1);
CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
filterUdiInfoRequest.setIsDisable(false);
BeanUtils.copyProperties(filterUdiInfoRequest, companyProductRelevanceRequest);
companyProductRelevanceRequest.setIsDisable(false);
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
if (filterUdiInfoRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType());

1
api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicUnitMaintainDao.java
Unescape Escape View File

@ -12,6 +12,7 @@ public interface BasicUnitMaintainDao {
List<BasicUnitMaintainEntity> filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity);
boolean insertBasicUnitMaintainignore(BasicUnitMaintainEntity basicUnitMaintainEntity);
boolean insert(BasicUnitMaintainEntity basicUnitMaintainEntity);

2
api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiRelevanceDao.java
Unescape Escape View File

@ -27,6 +27,8 @@ public interface UdiRelevanceDao {
boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);
boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity);
boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);
boolean deleteById(@Param("id") String id);

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

@ -18,7 +18,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
private String thirdId2;
private String thirdId3;
private String thirdId4;
private Boolean isDisable;
private String thirdCode;
private String thirdSys;

2
api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java
Unescape Escape View File

@ -47,7 +47,7 @@ public class CompanyProductRelevanceResponse {
private String sptm;
private String manufactory;
private String measname;
private Boolean isDisable;
private long customerId;
private String auditStatus;

2
api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicUnitMaintainService.java
Unescape Escape View File

@ -12,6 +12,8 @@ public interface BasicUnitMaintainService {
List<BasicUnitMaintainEntity> filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
boolean insertBasicUnitMaintainignore(BasicUnitMaintainEntity basicUnitMaintainEntity);
boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity);
boolean updateById(BasicUnitMaintainEntity basicUnitMaintainEntity);

2
api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java
Unescape Escape View File

@ -46,6 +46,8 @@ public interface UdiRelevanceService {
boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);
boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity);
boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);
boolean deleteById(String id);

5
api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java
Unescape Escape View File

@ -31,6 +31,11 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService {
return data;
}
@Override
public boolean insertBasicUnitMaintainignore(BasicUnitMaintainEntity basicUnitMaintainEntity) {
return basicUnitMaintainDao.insertBasicUnitMaintainignore(basicUnitMaintainEntity);
}
@Override
public boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity) {
return basicUnitMaintainDao.insertBasicUnitMaintain(basicUnitMaintainEntity);

5
api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java
Unescape Escape View File

@ -230,6 +230,11 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
return udiRelevanceDao.insertUdiRelevance(udiRelevanceEntity);
}
@Override
public boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity) {
return udiRelevanceDao.insertUdiRelevanceignore(udiRelevanceEntity);
}
@Override
public boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) {
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();

2
api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java
Unescape Escape View File

@ -233,7 +233,7 @@ public class BasicBackUpdateProductService {
udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode());
udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());
udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime());
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1);
udiRelevanceService.insertUdiRelevanceignore(udiRelevanceEntity1);
}
}

2
api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUnitImportService.java
Unescape Escape View File

@ -100,7 +100,7 @@ public class BasicUnitImportService {
basicUnitMaintainEntity.setContact(erpUnitsResponse.getContact());
basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile());
basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SP);
basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
basicUnitMaintainService.insertBasicUnitMaintainignore(basicUnitMaintainEntity);
}
}
}

35
api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml
Unescape Escape View File

@ -98,6 +98,41 @@
</insert>
<insert id="insertBasicUnitMaintainignore" keyProperty="id"
parameterType="com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity">
insert
ignore
INTO basic_corp
(thirdId,erpId,name,spell,
addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4,
thirdName,thirdName1,thirdName2,thirdName3,thirdName4,updateTime,corpType)
values
(
#{thirdId},
#{erpId},
#{name},
#{spell},
#{addr},
#{status},
#{type},
#{creditNo},
#{contact},
#{mobile},
#{thirdId1},
#{thirdId2},
#{thirdId3},
#{thirdId4},
#{thirdName},
#{thirdName1},
#{thirdName2},
#{thirdName3},
#{thirdName4},
#{updateTime},
#{corpType}
)
</insert>
<insert id="insert" parameterType="com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity">
insert INTO basic_corp(thirdId, erpId, name, spell, addr,
status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4,

8
api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
Unescape Escape View File

@ -9,7 +9,7 @@
basic_bussiness_type on basic_bussiness_type.localAction = basic_bustype_local.action
<where>
<if test="name != ''and name != null">
AND name LIKE concat(#{name},'%')
AND basic_bustype_local.name LIKE concat('%',#{name},'%')
</if>
<if test="action != ''and action != null">
AND action LIKE concat(#{action},'%')
@ -37,7 +37,7 @@
on basic_bustype_local.action = basic_bussiness_type.localAction
<where>
<if test="name != ''and name != null">
AND basic_bustype_local.name LIKE concat(#{name},'%')
AND basic_bustype_local.name LIKE concat('%',#{name},'%')
</if>
<if test="action != ''and action != null">
AND basic_bustype_local.action LIKE concat(#{action},'%')
@ -66,7 +66,7 @@
INNER JOIN inv_warehouse_user on inv_warehouse.`code` =inv_warehouse_user.`code`
<where>
<if test="name != ''and name != null">
AND basic_bustype_local.name LIKE concat(#{name},'%')
AND basic_bustype_local.name LIKE concat('%',#{name},'%')
</if>
<if test="action != ''and action != null">
AND basic_bustype_local.action LIKE concat(#{action},'%')
@ -96,7 +96,7 @@
LEFT JOIN basic_bussiness_type on basic_bussiness_type.localAction = basic_bustype_local.action
<where>
<if test="name != ''and name != null">
AND basic_bustype_local.name LIKE concat(#{name},'%')
AND basic_bustype_local.name LIKE concat('%',#{name},'%')
</if>
<if test="action != ''and action != null">
AND basic_bustype_local.action LIKE concat(#{action},'%')

12
api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
Unescape Escape View File

@ -21,13 +21,13 @@
on basic_bussiness_type.localAction = basic_bustype_local.action
<where>
<if test="name != ''and name != null">
AND basic_bussiness_type.name LIKE concat(#{name},'%')
AND basic_bussiness_type.name LIKE concat('%',#{name},'%')
</if>
<if test="action != ''and action != null">
AND basic_bussiness_type.action LIKE concat(#{action},'%')
AND basic_bussiness_type.action LIKE concat('%',#{action},'%')
</if>
<if test="mainAction != ''and mainAction != null">
AND basic_bussiness_type.mainAction LIKE concat(#{mainAction},'%')
AND basic_bussiness_type.mainAction LIKE concat('%',#{mainAction},'%')
</if>
<if test="enabled != ''and enabled != null">
AND basic_bussiness_type.enable =#{enabled}
@ -52,10 +52,10 @@
basic_bustype_local.action
<where>
<if test="name != ''and name != null">
AND name LIKE concat(#{name},'%')
AND basic_bussiness_type.name LIKE concat('%',#{name},'%')
</if>
<if test="action != ''and action != null">
AND `action` LIKE concat(#{action},'%')
AND `action` LIKE concat('%',#{action},'%')
</if>
<if test="mainAction != ''and mainAction != null">
AND mainAction LIKE concat(#{mainAction},'%')
@ -100,7 +100,7 @@
INNER JOIN inv_warehouse_user on inv_warehouse.`code` =inv_warehouse_user.`code`
<where>
<if test="name != ''and name != null">
AND basic_bussiness_type.name LIKE concat(#{name},'%')
AND basic_bussiness_type.name LIKE concat('%',#{name},'%')
</if>
<if test="action != ''and action != null">
AND basic_bussiness_type.action LIKE concat(#{action},'%')

40
api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -301,6 +301,46 @@
</insert>
<insert id="insertUdiRelevanceignore" keyProperty="id"
parameterType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity">
insert
ignore
INTO basic_udirel
(id,
thirdId,thirdName,uuid,isUseDy,updateTime,
thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
,mainId,mainName,lockStatus,udplatCode,isAdavence
)
values
(
#{id},
#{thirdId},
#{thirdName},
#{uuid},
#{isUseDy},
#{updateTime},
#{thirdId1},
#{thirdId2},
#{thirdId3},
#{thirdId4},
#{thirdName1},
#{thirdName2},
#{thirdName3},
#{thirdName4},
#{manufactory},
#{measname},
#{ybbm},
#{sptm},
#{isDisable},
#{isLock},
#{mainId},
#{mainName},
#{lockStatus},
#{udplatCode},
#{isAdavence}
)
</insert>
<delete id="deleteById" parameterType="Map">
DELETE
FROM basic_udirel

3
api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml
Unescape Escape View File

@ -135,6 +135,9 @@
<if test="unitFk != null and unitFk != ''">
and unitFk = #{unitFk}
</if>
<if test="isDisable == false">
AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false )
</if>
</where>
ORDER BY updateTime DESC
</select>

Write Preview
Loading…
Cancel
Save