导出台账调整

领用出库时间调整

src/main/java/com/jeeplus/modules/warehouse/ledger/service/LedgerService.java

@@ -274,7 +274,16 @@ public class LedgerService extends CrudService<LedgerMapper, Ledger> {
             ExcelExportInfo eei = new ExcelExportInfo();
             eei.setMonth(DateUtil.getMonth(oi.getOutbound().getOutboundTime()) + "");
             eei.setDay(DateUtil.getDay(oi.getOutbound().getOutboundTime()) + "");
+			if(StringUtils.isNotBlank(oi.getOutbound().getType())){
+				if(Objects.equals(oi.getOutbound().getType(), "2")){
+					eei.setBatch(oi.getLedgerInfo().getBatchNum()+"[盘亏]");
+				}else {
+					eei.setBatch(oi.getLedgerInfo().getBatchNum());
+				}
+			}else {
 				eei.setBatch(oi.getLedgerInfo().getBatchNum());
+			}
+
             eei.setRemarks(oi.getRemarks());
             eei.setTaskOrSend(1);
             eei.setTask("");

src/main/java/com/jeeplus/modules/warehouse/materialrequisition/service/MaterialRequisitionService.java

@@ -130,7 +130,7 @@ public class MaterialRequisitionService extends CrudService<MaterialRequisitionM
 		//设置当 前的操作人 与 发放物资的操作人相同
 		outbound.setOperator(materialRequisition.getOperator());
 		//当前出库时间
-		outbound.setOutboundTime(new Date());
+		outbound.setOutboundTime(materialRequisition.getTime());
 		//出库类型为 领用出库
 		outbound.setType("1");
 		List<OutboundInfo> outboundInfoList = new ArrayList<>();

src/main/java/com/jeeplus/modules/warehouse/outbound/mapper/xml/OutboundInfoMapper.xml

@@ -6,6 +6,7 @@
 		a.id AS "id",
 		a.outbound_id AS "outbound.id",
 		outbound.outbound_time AS "outbound.outboundTime",
+		outbound.type AS "outbound.type",
 		a.ledger_info_id AS "ledgerInfo.id",
 		ledgerInfo.code AS "ledgerInfo.code",
 		ledgerInfo.batch_num AS "ledgerInfo.batchNum",