bug修改

fencang
anthonyywj2 3 years ago
parent eaec15dc88
commit df7d724d14

@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.Date;
import java.util.List; import java.util.List;
@RestController @RestController
@ -100,6 +101,13 @@ public class InvSubWarehouseController {
} else { } else {
invSubWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + ""); invSubWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
} }
InvWarehouseEntity updateEntity = new InvWarehouseEntity();
updateEntity.setId(pEntity.getId());
updateEntity.setUpdateTime(new Date());
invWarehouseService.updateInvWarehouse(updateEntity);
invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + ""); invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + "");
boolean b = invSubWarehouseService.insertInvSubWarehouse(invSubWarehouseEntity); boolean b = invSubWarehouseService.insertInvSubWarehouse(invSubWarehouseEntity);
if (!b) { if (!b) {

@ -835,7 +835,7 @@ public class IoTransInoutService {
public void syncprintOrder(String orderId) { public void syncprintOrder(String orderId) {
OrderEntity orderEntity = orderService.findById(orderId); OrderEntity orderEntity = orderService.findById(orderId);
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction()); BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS && orderEntity.getErpFk() == null if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS && StrUtil.isEmpty(orderEntity.getErpFk())
) { ) {
//查询单据校验后生成的单据详情 //查询单据校验后生成的单据详情

@ -12,7 +12,7 @@
and id = #{id} and id = #{id}
</if> </if>
<if test="taskId != null and taskId != ''"> <if test="taskId != null and taskId != ''">
and taskId = #{taskId} AND taskId LIKE concat('%',#{taskId},'%')
</if> </if>
<if test="status != null"> <if test="status != null">
and status = #{status} and status = #{status}

Loading…
Cancel
Save