|
|
|
@ -12,6 +12,7 @@ import org.springblade.desk.common.feign.IMesApprovalRecordClient; |
|
|
|
import org.springblade.desk.common.pojo.dto.MesApprovalRecordFeignDTO; |
|
|
|
import org.springblade.desk.common.pojo.dto.MesApprovalRecordFeignDTO; |
|
|
|
import org.springblade.system.feign.ISysClient; |
|
|
|
import org.springblade.system.feign.ISysClient; |
|
|
|
import org.springblade.system.feign.IUserClient; |
|
|
|
import org.springblade.system.feign.IUserClient; |
|
|
|
|
|
|
|
import org.springblade.system.pojo.entity.User; |
|
|
|
import org.springblade.wms.excel.StOtherOutRecordExcel; |
|
|
|
import org.springblade.wms.excel.StOtherOutRecordExcel; |
|
|
|
import org.springblade.wms.mapper.StOtherOutRecordMapper; |
|
|
|
import org.springblade.wms.mapper.StOtherOutRecordMapper; |
|
|
|
import org.springblade.wms.mapper.StReturnRecordMapper; |
|
|
|
import org.springblade.wms.mapper.StReturnRecordMapper; |
|
|
|
@ -198,7 +199,6 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void addOtherOutRecord(StOtherOutRecord stOtherOutRecord, List<StRealtimeStock> outList, BladeUser user) { |
|
|
|
public void addOtherOutRecord(StOtherOutRecord stOtherOutRecord, List<StRealtimeStock> outList, BladeUser user) { |
|
|
|
|
|
|
|
|
|
|
|
BladeUser user1 = AuthUtil.getUser(); |
|
|
|
|
|
|
|
int a = 0, b = 0; |
|
|
|
int a = 0, b = 0; |
|
|
|
for (StRealtimeStock stock : outList) { |
|
|
|
for (StRealtimeStock stock : outList) { |
|
|
|
if (stock.getOutQuantity() == null) { |
|
|
|
if (stock.getOutQuantity() == null) { |
|
|
|
@ -339,9 +339,15 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor |
|
|
|
StOtherOutRecord stOtherOutRecord = new StOtherOutRecord(); |
|
|
|
StOtherOutRecord stOtherOutRecord = new StOtherOutRecord(); |
|
|
|
stOtherOutRecord.setOutType(StOtherOutRecord.OUT_TYPE_PRODUCTION); |
|
|
|
stOtherOutRecord.setOutType(StOtherOutRecord.OUT_TYPE_PRODUCTION); |
|
|
|
stOtherOutRecord.setPicker(userId); |
|
|
|
stOtherOutRecord.setPicker(userId); |
|
|
|
|
|
|
|
stOtherOutRecord.setRlsId(stock.getId()); |
|
|
|
stOtherOutRecord.setOutQty(stock.getQuantity()); |
|
|
|
stOtherOutRecord.setOutQty(stock.getQuantity()); |
|
|
|
|
|
|
|
|
|
|
|
this.addOtherOutRecord(stOtherOutRecord, Collections.singletonList(stock) , AuthUtil.getUser()); |
|
|
|
User user = userClient.userInfoById(userId).getData(); |
|
|
|
|
|
|
|
BladeUser bladeUser = new BladeUser(); |
|
|
|
|
|
|
|
bladeUser.setUserId(userId); |
|
|
|
|
|
|
|
bladeUser.setDeptId(user.getDeptId()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.addOtherOutRecord(stOtherOutRecord, Collections.singletonList(stock) , bladeUser); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
|