|
|
|
@ -34,6 +34,7 @@ import com.glxp.api.service.system.SystemPDFModuleService;
|
|
|
|
|
import com.glxp.api.service.system.SystemPDFTemplateService;
|
|
|
|
|
import com.glxp.api.service.thrsys.ThrProductsService;
|
|
|
|
|
import com.glxp.api.util.JasperUtils;
|
|
|
|
|
import com.glxp.api.util.MsDateUtil;
|
|
|
|
|
import net.sf.jasperreports.engine.JRException;
|
|
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
|
@ -317,7 +318,7 @@ public class IoOrderDetailResultController extends BaseController {
|
|
|
|
|
for (CptTraceOrderResponse cptTraceOrderResponse : cptTraceOrderResponses) {
|
|
|
|
|
CptTraceResultResponse cptTraceResultResponse = new CptTraceResultResponse();
|
|
|
|
|
cptTraceResultResponse.setBillNo(cptTraceOrderResponse.getBillNo());
|
|
|
|
|
cptTraceResultResponse.setBillDate(DateUtil.formatDate(cptTraceOrderResponse.getCreateTime()));
|
|
|
|
|
cptTraceResultResponse.setBillDate(MsDateUtil.formatDate(cptTraceOrderResponse.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
|
|
cptTraceResultResponse.setBillType(cptTraceOrderResponse.getBillType());
|
|
|
|
|
if (cptTraceOrderResponse.getMainAction().equals(ConstantType.TYPE_OUT)) {
|
|
|
|
|
if (StrUtil.isNotEmpty(cptTraceOrderResponse.getFromInvCode()))
|
|
|
|
|