|
|
@@ -422,6 +422,13 @@ public class MESDataServiceImpl implements MESDataService {
|
|
|
String AE_MASTER = checkAccessKey(accessKey, requestId);
|
|
|
SpObserver.putSp(AE_MASTER);
|
|
|
Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data);
|
|
|
+ String indate = StringUtil.nvl(map.get("indate"), "");
|
|
|
+ if ("".equals(indate)){
|
|
|
+ return ApiResponse.failRsp("10034","请确认拍照时间！");
|
|
|
+
|
|
|
+ }
|
|
|
+ baseDao.execute("insert into ProdCCDQRCode_His (pcq_id,pcq_date,pcq_indate,pcq_qrcode,pcq_qrgrade,pcq_machineno,pcq_macode,pcq_retraceno1,pcq_retraceno2,pcq_retraceno3,pcq_retraceno4,pcq_retraceno5,pcq_retraceno6,pcq_retraceno7,pcq_retraceno8,pcq_retraceno9,pcq_retraceno10) " +
|
|
|
+ "values (ProdCCDQRCode_His_seq.nextval,sysdate,to_date('"+indate+"','yyyy-MM-dd HH24:mi:ss'),'"+StringUtil.nvl(map.get("QRCode"), "")+"','"+StringUtil.nvl(map.get("QRGrade"), "")+"','"+StringUtil.nvl(map.get("MachineNo"), "")+"','"+StringUtil.nvl(map.get("MaCode"), "")+"','"+StringUtil.nvl(map.get("RetraceNo1"), "")+"','"+StringUtil.nvl(map.get("RetraceNo2"), "")+"','"+StringUtil.nvl(map.get("RetraceNo3"), "")+"','"+StringUtil.nvl(map.get("RetraceNo4"), "")+"','"+StringUtil.nvl(map.get("RetraceNo5"), "")+"','"+StringUtil.nvl(map.get("RetraceNo6"), "")+"','"+StringUtil.nvl(map.get("RetraceNo7"), "")+"','"+StringUtil.nvl(map.get("RetraceNo8"), "")+"','"+StringUtil.nvl(map.get("RetraceNo9"), "")+"','"+StringUtil.nvl(map.get("RetraceNo10"), "")+"')");
|
|
|
String QRCode = StringUtil.nvl(map.get("QRCode"), "");
|
|
|
if ("".equals(QRCode)){
|
|
|
return ApiResponse.failRsp("10031","条码不能为空！");
|
|
|
@@ -438,11 +445,6 @@ public class MESDataServiceImpl implements MESDataService {
|
|
|
if ("".equals(MachineNo)){
|
|
|
return ApiResponse.failRsp("10033","机台号不能为空！");
|
|
|
}
|
|
|
- String indate = StringUtil.nvl(map.get("indate"), "");
|
|
|
- if ("".equals(indate)){
|
|
|
- return ApiResponse.failRsp("10034","请确认拍照时间！");
|
|
|
-
|
|
|
- }
|
|
|
String condition="pcq_qrcode='"+QRCode+"'";
|
|
|
String MaCode = StringUtil.nvl(map.get("MaCode"), "");
|
|
|
if (!"".equals(MaCode)) {
|
koul