|
|
|
@ -29,6 +29,9 @@ class Group_model extends CI_Model {
|
|
|
|
|
-- 上线初期避免已录入的重复
|
|
|
|
|
AND VAS_SN >=1688036
|
|
|
|
|
AND isnull(VAS_IsConfirm,0)=0 AND isnull(VAS_SendVary,0)=0
|
|
|
|
|
and not exists (
|
|
|
|
|
select 1 from VendorPlanSendout where VPS_VAS_SN=VAS_SN
|
|
|
|
|
)
|
|
|
|
|
";
|
|
|
|
|
$sql .= " order by EOI_GetDate asc,vas.VAS_SendTime asc, vas.VAS_IsConfirm asc";
|
|
|
|
|
return $this->HT->query($sql)->result();
|
|
|
|
@ -121,7 +124,7 @@ class Group_model extends CI_Model {
|
|
|
|
|
$vgrd->ACI_BabyNum = intval($vcold->COLD_BabyNum);
|
|
|
|
|
$vgrd->PAG_DEI_SN = $vcold->PAG_DEI_SN;
|
|
|
|
|
$vgrd->PAG_sub_sn = intval($vcold->COLD_ServiceSN2);
|
|
|
|
|
$vgrd->vendor_memo = trim($vcold->COLD_VendorMemo);
|
|
|
|
|
$vgrd->vendor_memo = trim($vcold->COLD_vendorMemo);
|
|
|
|
|
if ( strval($vcold->COLD_ServiceType)==='D') {
|
|
|
|
|
$vgrd->PAG_Code = mb_strtoupper($vcold->PAG_Code);
|
|
|
|
|
$vgrd->PAG_ExtendType = mb_strtoupper($vcold->PAG_ExtendType);
|
|
|
|
|