|
@@ -3141,8 +3141,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
|
|
|
*/
|
|
|
//坯料计划承诺交货期
|
|
|
String[] split = productCardVo.getPromiseDate().split("~");
|
|
|
- DateTime promiseStartDate = DateUtil.parseDate(split[0] + " 00:00:00");
|
|
|
- DateTime promiseEndDate = DateUtil.parseDate(split[1] + " 23:59:59");
|
|
|
+ DateTime promiseStartDate = DateUtil.parse(split[0] + " 00:00:00");
|
|
|
+ DateTime promiseEndDate = DateUtil.parse(split[1] + " 23:59:59");
|
|
|
if (Arrays.asList("待开工", "加工中", "部分取消", "已完工").contains(productCardVo.getStatus())) {
|
|
|
DateTime endDate = null;
|
|
|
if (Arrays.asList("待开工", "加工中").contains(productCardVo.getStatus())) {
|