Merge remote-tracking branch 'origin/dev' into test

test
郑明梁 2 years ago
commit 7cdcc7e5bd

@ -264,4 +264,11 @@ public class IoOrderEntity {
@TableField(value = "rmInvCode") @TableField(value = "rmInvCode")
private String rmInvCode; private String rmInvCode;
/**
*
*/
@TableField(value = "outSickInfo")
private String outSickInfo;
} }

@ -192,4 +192,7 @@ public class FilterOrderRequest extends ListPageRequest {
private String invoiceEncode; private String invoiceEncode;
//联合备注字段查询
private String unionRemark;
} }

@ -52,7 +52,8 @@ public class IoGenInvService {
IoCodeService codeService; IoCodeService codeService;
@Resource @Resource
IBasicBusTypePreService basicBusTypePreService; IBasicBusTypePreService basicBusTypePreService;
@Resource
IBasicBussinessTypeService basicBussinessTypeService;
@Resource @Resource
IoChangeInoutService ioChangeInoutService; IoChangeInoutService ioChangeInoutService;
@ -64,6 +65,13 @@ public class IoGenInvService {
List<IoOrderDetailResultEntity> orderDetailResultEntities = orderDetailResultService.findByOrderId(orderId); List<IoOrderDetailResultEntity> orderDetailResultEntities = orderDetailResultService.findByOrderId(orderId);
List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderId); List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderId);
//补齐单据信息
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT && bussinessTypeEntity.isGenUnit()) {
orderEntity.setOutSickInfo(orderEntity.getFromCorp());
orderService.update(orderEntity);
}
//生成库存产品表 //生成库存产品表
for (IoOrderDetailResultEntity orderDetailResultEntity : orderDetailResultEntities) { for (IoOrderDetailResultEntity orderDetailResultEntity : orderDetailResultEntities) {
InvProductEntity invProductEntity = invProductService.selectByUnique(orderDetailResultEntity.getBindRlFk(), orderDetailResultEntity.getBatchNo(), orderDetailResultEntity.getSupId(), orderEntity.getDeptCode(), orderEntity.getInvCode()); InvProductEntity invProductEntity = invProductService.selectByUnique(orderDetailResultEntity.getBindRlFk(), orderDetailResultEntity.getBatchNo(), orderDetailResultEntity.getSupId(), orderEntity.getDeptCode(), orderEntity.getInvCode());

@ -3,7 +3,7 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_zyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: 123456 password: 123456
hikari: hikari:

@ -53,6 +53,10 @@
<if test="relKey != null"> <if test="relKey != null">
AND relKey = #{relKey} AND relKey = #{relKey}
</if> </if>
<if test="unionRemark != null and unionRemark != ''">
AND (io.remark like concat('%', #{unionRemark}, '%')
or io.outSickInfo like concat('%', #{unionRemark}, '%'))
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
</if> </if>
@ -205,6 +209,10 @@
<if test="relKey != null"> <if test="relKey != null">
AND relKey = #{relKey} AND relKey = #{relKey}
</if> </if>
<if test="unionRemark != null and unionRemark != ''">
AND (io.remark like concat('%', #{unionRemark}, '%')
or io.outSickInfo like concat('%', #{unionRemark}, '%'))
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
</if> </if>
@ -313,6 +321,10 @@
<if test="fromCorp != null and fromCorp != ''"> <if test="fromCorp != null and fromCorp != ''">
AND fromCorp = #{fromCorp} AND fromCorp = #{fromCorp}
</if> </if>
<if test="unionRemark != null and unionRemark != ''">
AND (io.remark like concat('%', #{unionRemark}, '%')
or io.outSickInfo like concat('%', #{unionRemark}, '%'))
</if>
<if test="customerId != null and customerId != ''"> <if test="customerId != null and customerId != ''">
AND customerId = #{customerId} AND customerId = #{customerId}
</if> </if>
@ -460,6 +472,10 @@
<if test="busType != null"> <if test="busType != null">
AND io.busType = #{busType} AND io.busType = #{busType}
</if> </if>
<if test="unionRemark != null and unionRemark != ''">
AND (io.remark like concat('%', #{unionRemark}, '%')
or io.outSickInfo like concat('%', #{unionRemark}, '%'))
</if>
<if test="inCodeStatus != null"> <if test="inCodeStatus != null">
AND io.inCodeStatus = #{inCodeStatus} AND io.inCodeStatus = #{inCodeStatus}
</if> </if>
@ -556,6 +572,4 @@
</otherwise> </otherwise>
</choose> </choose>
</select> </select>
</mapper> </mapper>

@ -436,3 +436,6 @@ VALUES (20059, 0, '是否允许编辑第三方产品信息', 'enable_edit_third'
CALL Pro_Temp_ColumnWork('io_order', 'rmFromCorp', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('io_order', 'rmFromCorp', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order', 'rmDeptCode', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('io_order', 'rmDeptCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order', 'rmInvCode', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('io_order', 'rmInvCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1);

Loading…
Cancel
Save