|
|
|
@ -21,8 +21,10 @@ import com.op.system.api.domain.device.EquRepairOrderDTO;
|
|
|
|
|
import com.op.system.api.domain.dto.WCSDTO;
|
|
|
|
|
import com.op.system.api.domain.dto.WCSDataDTO;
|
|
|
|
|
import com.op.system.api.domain.dto.WechartDTO;
|
|
|
|
|
import com.op.system.api.domain.mes.BaseProductDTO;
|
|
|
|
|
import com.op.system.api.domain.mes.ProRfidProcessDetail;
|
|
|
|
|
import com.op.system.api.domain.quality.*;
|
|
|
|
|
import com.op.system.api.domain.sap.SapSupplier;
|
|
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
|
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
@ -615,7 +617,7 @@ public class OpenServiceImpl implements OpenService {
|
|
|
|
|
@Override
|
|
|
|
|
public AjaxResult sendWeChartMessage(List<WechartDTO> dtos) {
|
|
|
|
|
try {
|
|
|
|
|
logger.info(JSONObject.toJSONString("open企业微信发送参数"+dtos));
|
|
|
|
|
logger.info("open企业微信发送参数:"+JSONObject.toJSONString(dtos));
|
|
|
|
|
String result = HttpUtils.sendPostWechart(weChartUrl, JSON.toJSONString(dtos));
|
|
|
|
|
return success(result);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
@ -624,7 +626,45 @@ public class OpenServiceImpl implements OpenService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 物料编码+productCode
|
|
|
|
|
* 物料描述+productDescZh
|
|
|
|
|
* 物料组编码+productGroup
|
|
|
|
|
* 物料组名称+productGroupName
|
|
|
|
|
* 单位+meins
|
|
|
|
|
* 规格+productModel
|
|
|
|
|
* 计量转换分子+umrez
|
|
|
|
|
* 分母UMREZ+umren
|
|
|
|
|
* 检验标准+ mvgr5
|
|
|
|
|
* 毛重(无\0)+ grosseight
|
|
|
|
|
* 体积 volume
|
|
|
|
|
* **/
|
|
|
|
|
@Override
|
|
|
|
|
public AjaxResult sendProductCheckNo(List<BaseProductDTO> dtos) {
|
|
|
|
|
try {
|
|
|
|
|
logger.info("oa更新检验标准发送参数"+JSONObject.toJSONString(dtos));
|
|
|
|
|
// int allsize = dtos.size();
|
|
|
|
|
// if(CollectionUtils.isEmpty(dtos)){
|
|
|
|
|
// return error("oa更新检验标准发送参数为空");
|
|
|
|
|
// }
|
|
|
|
|
// int inserttimes = allsize / 100 + 1;
|
|
|
|
|
// for (int m = 0; m < inserttimes; m++) {
|
|
|
|
|
// List<BaseProductDTO> everyList;
|
|
|
|
|
// if (m < (inserttimes - 1)) {
|
|
|
|
|
// everyList = dtos.subList(m * 100, (m + 1) * 100);
|
|
|
|
|
// } else {
|
|
|
|
|
// everyList = dtos.subList(m * 100, allsize);
|
|
|
|
|
// }
|
|
|
|
|
// if (everyList.size() > 0) {
|
|
|
|
|
// sapBomMapper.addSupplierBatchs(everyList);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
return success();
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
return error(e.getMessage());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
protected Boolean oneMinHas(Date lastData){
|
|
|
|
|
if(lastData != null){
|
|
|
|
|