|
|
|
@ -36,10 +36,9 @@ import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
import java.math.RoundingMode;
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
import java.time.LocalDate;
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
|
import java.time.LocalTime;
|
|
|
|
|
|
|
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
|
|
import java.time.temporal.ChronoUnit;
|
|
|
|
|
import java.util.*;
|
|
|
|
@ -849,7 +848,8 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
|
|
|
|
|
}
|
|
|
|
|
sapRFW.setLt_hwList(lt_hwList);
|
|
|
|
|
sapRFW.setAnzma(workOrder.getSapCode());//产线编号
|
|
|
|
|
sapRFW.setBudat(DateUtils.formatToYYYYMMDD(workOrder.getProductDate(),"yyyy-MM-dd"));
|
|
|
|
|
String productDate = workOrder.getProductDate().replace("-", "");
|
|
|
|
|
sapRFW.setBudat(productDate);
|
|
|
|
|
sapRFW.setRemark(workOrder.getRemark());//备注
|
|
|
|
|
logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工请求:" + JSONObject.toJSONString(sapRFW));
|
|
|
|
|
R r = remoteSapService.sapRFWOrder(sapRFW);
|
|
|
|
@ -912,7 +912,8 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
|
|
|
|
|
}
|
|
|
|
|
sapRFW.setLt_hwList(lt_hwList);
|
|
|
|
|
sapRFW.setAnzma(workOrder.getSapCode());//产线编号
|
|
|
|
|
sapRFW.setBudat(DateUtils.formatToYYYYMMDD(workOrder.getProductDate(),"yyyy-MM-dd"));
|
|
|
|
|
String productDate = workOrder.getProductDate().replace("-", "");
|
|
|
|
|
sapRFW.setBudat(productDate);
|
|
|
|
|
sapRFW.setRemark(workOrder.getRemark());//备注
|
|
|
|
|
logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工请求:" + JSONObject.toJSONString(sapRFW));
|
|
|
|
|
//R r= R.ok();
|
|
|
|
@ -939,7 +940,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
|
|
|
|
|
* @param workOrder
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
private R preReportToSap(MesReportWork workOrder) {
|
|
|
|
|
private R preReportToSap(MesReportWork workOrder) throws Exception {
|
|
|
|
|
Date nowTime = DateUtils.getNowDate();
|
|
|
|
|
SapRFW sapRFW = new SapRFW();
|
|
|
|
|
sapRFW.setAufnr(workOrder.getWorkorderCodeSap());//虚拟工单号
|
|
|
|
@ -971,6 +972,8 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
|
|
|
|
|
// }
|
|
|
|
|
sapRFW.setLt_hwList(lt_hwList);
|
|
|
|
|
sapRFW.setAnzma(workOrder.getSapCode());//产线编号
|
|
|
|
|
String productDate = workOrder.getProductDate().replace("-", "");
|
|
|
|
|
sapRFW.setBudat(productDate);
|
|
|
|
|
sapRFW.setRemark(workOrder.getRemark());//备注
|
|
|
|
|
logger.info(workOrder.getWorkorderCodeSap() + "sap工单预报工请求:" + JSONObject.toJSONString(sapRFW));
|
|
|
|
|
R r = remoteSapService.sapRFWOrder(sapRFW);
|
|
|
|
|